diff --git a/CHANGELOG b/CHANGELOG
index f65988948..472b1464d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ Version 1.4.0
     * saving passwords should now work for much more sites
     * don't steal Ctrl+B/U/I shortcuts from page
     * disabled by default opacity effect on tab previews - see BUILDING
+    * improved showing navigation toolbar in fullscreen
     * fixed scrolling to anchor in background tabs
     * fixed parsing UTF-8 filenames in Content-Disposition header
     * fixed crash with context menu in websearchbar and locationbar
diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp
index 4a38e6c69..230558631 100644
--- a/src/lib/app/qupzilla.cpp
+++ b/src/lib/app/qupzilla.cpp
@@ -2115,11 +2115,14 @@ bool QupZilla::quitApp()
         Settings settings;
         settings.beginGroup("Browser-View-Settings");
         settings.setValue("WindowMaximised", windowState().testFlag(Qt::WindowMaximized));
-        settings.setValue("WindowGeometry", saveGeometry());
         settings.setValue("LocationBarWidth", m_navigationBar->splitter()->sizes().at(0));
         settings.setValue("WebSearchBarWidth", m_navigationBar->splitter()->sizes().at(1));
         settings.setValue("SideBarWidth", m_sideBarWidth);
         settings.setValue("WebViewWidth", m_webViewWidth);
+
+        if (!isFullScreen()) {
+            settings.setValue("WindowGeometry", saveGeometry());
+        }
         settings.endGroup();
     }