diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp
index 35ea8117..f6845abc 100644
--- a/YACReaderLibrary/classic_comics_view.cpp
+++ b/YACReaderLibrary/classic_comics_view.cpp
@@ -92,6 +92,7 @@ void ClassicComicsView::setToolBar(QToolBar *toolBar)
 
 void ClassicComicsView::setModel(ComicModel *model)
 {
+    QLOG_DEBUG() << "Setting model";
 
     ComicsView::setModel(model);
 
@@ -137,12 +138,10 @@ void ClassicComicsView::setModel(ComicModel *model)
         comicFlow->setImagePaths(paths);
         comicFlow->setMarks(model->getReadList());
         //comicFlow->setFocus(Qt::OtherFocusReason);
+
+        if(settings->contains(COMICS_VIEW_HEADERS))
+            tableView->horizontalHeader()->restoreState(settings->value(COMICS_VIEW_HEADERS).toByteArray());
     }
-
-    if(settings->contains(COMICS_VIEW_HEADERS))
-        tableView->horizontalHeader()->restoreState(settings->value(COMICS_VIEW_HEADERS).toByteArray());
-
-
 }
 
 void ClassicComicsView::setCurrentIndex(const QModelIndex &index)
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index ca53121c..57853e5b 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -2145,6 +2145,7 @@ void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, Q
         foldersModelProxy->setFilter(modifier, filter, true);//includeComicsCheckBox->isChecked());
         comicsModel->setupModelData(modifier, filter, foldersModel->getDatabase());
         comicsView->enableFilterMode(true);
+        comicsView->setModel(comicsModel); //TODO, columns are messed up after ResetModel some times, this shouldn't be necesary
         foldersView->expandAll();
 
         if(comicsModel->rowCount() == 0)