diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp
index 782f4b33..c9af2ffb 100644
--- a/YACReader/main_window_viewer.cpp
+++ b/YACReader/main_window_viewer.cpp
@@ -889,6 +889,7 @@ void MainWindowViewer::toggleFullScreen()
 }
 
 //QTBUG-41883
+#ifdef Q_OS_WIN
 void MainWindowViewer::toFullScreen()
 {
     _size = size();
@@ -936,6 +937,42 @@ void MainWindowViewer::toNormal()
 
     show();
 }
+
+#else
+
+void MainWindowViewer::toFullScreen()
+{
+    fromMaximized = this->isMaximized();
+
+    hideToolBars();
+    viewer->hide();
+    viewer->fullscreen = true;//TODO, change by the right use of windowState();
+    showFullScreen();
+    viewer->show();
+    if(viewer->magnifyingGlassIsVisible())
+        viewer->showMagnifyingGlass();
+}
+
+void MainWindowViewer::toNormal()
+{
+    //show all
+    viewer->hide();
+    viewer->fullscreen = false;//TODO, change by the right use of windowState();
+    //viewer->hideMagnifyingGlass();
+    if(fromMaximized)
+        showMaximized();
+    else
+        showNormal();
+
+    if(Configuration::getConfiguration().getShowToolbars())
+        showToolBars();
+    viewer->show();
+    if(viewer->magnifyingGlassIsVisible())
+        viewer->showMagnifyingGlass();
+}
+
+#endif
+
 void MainWindowViewer::toggleToolBars()
 {
 	toolbars?hideToolBars():showToolBars();
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 57853e5b..5ac62d96 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -2083,6 +2083,8 @@ void LibraryWindow::toggleFullScreen()
 	fullscreen = !fullscreen;
 }
 
+#ifdef Q_OS_WIN
+
 //QTBUG-41883
 void LibraryWindow::toFullScreen()
 {
@@ -2137,6 +2139,45 @@ void LibraryWindow::toNormal()
 
 }
 
+#else
+
+void LibraryWindow::toFullScreen()
+{
+    fromMaximized = this->isMaximized();
+
+    sideBar->hide();
+    libraryToolBar->hide();
+
+    comicsView->toFullScreen();
+
+    showFullScreen();
+}
+
+void LibraryWindow::toNormal()
+{
+    sideBar->show();
+
+    comicsView->toNormal();
+
+    if(fromMaximized)
+        showMaximized();
+    else
+        showNormal();
+
+#ifdef Q_OS_MAC
+    QTimer * timer = new QTimer();
+    timer->setSingleShot(true);
+    timer->start();
+    connect(timer,SIGNAL(timeout()),libraryToolBar,SLOT(show()));
+    connect(timer,SIGNAL(timeout()),timer,SLOT(deleteLater()));
+#else
+    libraryToolBar->show();
+#endif
+
+}
+
+#endif
+
 void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, QString filter)
 {
     if(!filter.isEmpty())