diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index e3a1ec98..d4c76b16 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -2259,7 +2259,7 @@ void LibraryWindow::toFullScreen()
     setGeometry(r);
     show();
 
-    contentViewsManager->comicsView->toFullScreen();
+    contentViewsManager->toFullscreen();
 }
 
 void LibraryWindow::toNormal()
@@ -2275,7 +2275,7 @@ void LibraryWindow::toNormal()
     if (fromMaximized)
         showMaximized();
 
-    contentViewsManager->comicsView->toNormal();
+    contentViewsManager->toNormal();
 }
 
 #else
@@ -2287,7 +2287,7 @@ void LibraryWindow::toFullScreen()
     sideBar->hide();
     libraryToolBar->hide();
 
-    contentViewsManager->comicsView->toFullScreen();
+    contentViewsManager->toFullScreen();
 
     showFullScreen();
 }
@@ -2296,7 +2296,7 @@ void LibraryWindow::toNormal()
 {
     sideBar->show();
 
-    contentViewsManager->comicsView->toNormal();
+    contentViewsManager->toNormal();
 
     if (fromMaximized)
         showMaximized();
diff --git a/YACReaderLibrary/yacreader_content_views_manager.cpp b/YACReaderLibrary/yacreader_content_views_manager.cpp
index f978599c..64dadbb6 100644
--- a/YACReaderLibrary/yacreader_content_views_manager.cpp
+++ b/YACReaderLibrary/yacreader_content_views_manager.cpp
@@ -79,6 +79,22 @@ void YACReaderContentViewsManager::updateContinueReadingView()
     }
 }
 
+void YACReaderContentViewsManager::toFullscreen()
+{
+    if (comicsViewStack->currentWidget() == comicsView) {
+        comicsView->toFullScreen();
+        return;
+    }
+}
+
+void YACReaderContentViewsManager::toNormal()
+{
+    if (comicsViewStack->currentWidget() == comicsView) {
+        comicsView->toNormal();
+        return;
+    }
+}
+
 void YACReaderContentViewsManager::showComicsView()
 {
     comicsViewStack->setCurrentWidget(comicsView);
diff --git a/YACReaderLibrary/yacreader_content_views_manager.h b/YACReaderLibrary/yacreader_content_views_manager.h
index 04269a2e..cfd6b8ae 100644
--- a/YACReaderLibrary/yacreader_content_views_manager.h
+++ b/YACReaderLibrary/yacreader_content_views_manager.h
@@ -42,6 +42,9 @@ public:
     void updateCurrentComicView();
     void updateContinueReadingView();
 
+    void toFullscreen();
+    void toNormal();
+
 protected:
     QStackedWidget *comicsViewStack;
     LibraryWindow *libraryWindow;