diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index a920350..8604b32 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -53,6 +53,9 @@
 #include <QPushButton>
 #include <QLabel>
 #include <QMessageBox>
+#ifdef _WIN32
+#include <QtPlatformHeaders/QWindowsWindowFunctions>
+#endif
 
 TEnv::IntVar ViewCameraToggleAction("ViewCameraToggleAction", 1);
 TEnv::IntVar ViewTableToggleAction("ViewTableToggleAction", 1);
@@ -1187,9 +1190,16 @@ void MainWindow::maximizePanel() {
 
 void MainWindow::fullScreenWindow() {
   if (isFullScreen())
-    setWindowState(Qt::WindowMaximized);
-  else
-    setWindowState(Qt::WindowFullScreen);
+    showNormal();
+  else {
+#if defined(_WIN32)
+    // http://doc.qt.io/qt-5/windows-issues.html#fullscreen-opengl-based-windows
+    this->winId();
+    QWindowsWindowFunctions::setHasBorderInFullScreen(this->windowHandle(),
+                                                      true);
+#endif
+    this->showFullScreen();
+  }
 }
 
 //-----------------------------------------------------------------------------