diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp
index 54f9d4f6..71dfa44d 100644
--- a/YACReaderLibrary/grid_comics_view.cpp
+++ b/YACReaderLibrary/grid_comics_view.cpp
@@ -157,8 +157,6 @@ void GridComicsView::setToolBar(QToolBar *toolBar)
 
 void GridComicsView::setModel(ComicModel *model)
 {
-    BOOL setModel = model != this->model;
-
     if(model == NULL)
         return;
 
@@ -171,8 +169,7 @@ void GridComicsView::setModel(ComicModel *model)
 
     _selectionModel = new QItemSelectionModel(model);
 
-    if(setModel)
-        ctxt->setContextProperty("comicsList", model);
+    ctxt->setContextProperty("comicsList", model);
     ctxt->setContextProperty("comicsSelection", _selectionModel);
     ctxt->setContextProperty("contextMenuHelper",this);
     ctxt->setContextProperty("comicsSelectionHelper", this);
diff --git a/YACReaderLibrary/info_comics_view.cpp b/YACReaderLibrary/info_comics_view.cpp
index e251e7ce..b7e5dad5 100644
--- a/YACReaderLibrary/info_comics_view.cpp
+++ b/YACReaderLibrary/info_comics_view.cpp
@@ -48,8 +48,6 @@ void InfoComicsView::setToolBar(QToolBar *toolBar)
 
 void InfoComicsView::setModel(ComicModel *model)
 {
-    BOOL setModel = model != this->model;
-
     if(model == NULL)
         return;
 
@@ -62,12 +60,7 @@ void InfoComicsView::setModel(ComicModel *model)
 
     _selectionModel = new QItemSelectionModel(model);*/
 
-    //TODO fix crash in the following line on comics views switch
-
-    int row = currentIndex().row();
-
-    if(setModel)
-        ctxt->setContextProperty("comicsList", model);
+    ctxt->setContextProperty("comicsList", model);
     ctxt->setContextProperty("backgroundImage", this->model->data(this->model->index(0, 0), ComicModel::CoverPathRole));
 
     /*ctxt->setContextProperty("comicsSelection", _selectionModel);
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 9def54cf..798780f9 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -1267,6 +1267,7 @@ void LibraryWindow::loadLibrary(const QString & name)
 
 void LibraryWindow::loadCoversFromCurrentModel()
 {
+    comicsViewsManager->comicsView->setModel(new ComicModel());  //TODO fix this
     comicsViewsManager->comicsView->setModel(comicsModel);
 }