diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp
index 8c2bbeb..3c9d6a6 100644
--- a/toonz/sources/toonz/main.cpp
+++ b/toonz/sources/toonz/main.cpp
@@ -82,6 +82,10 @@
 #include <QLibraryInfo>
 #include <QHash>
 
+#ifdef _WIN32
+#include <QtPlatformHeaders/QWindowsWindowFunctions>
+#endif
+
 using namespace DVGui;
 #if defined LINETEST
 const char *applicationName    = "Toonz LineTest";
@@ -229,7 +233,7 @@ project->setUseScenePath(TProject::Extras, false);
   // Imposto la rootDir per ImageCache
 
   /*-- TOONZCACHEROOTの設定  --*/
-  TFilePath cacheDir = ToonzFolder::getCacheRootFolder();
+  TFilePath cacheDir               = ToonzFolder::getCacheRootFolder();
   if (cacheDir.isEmpty()) cacheDir = TEnv::getStuffDir() + "cache";
   TImageCache::instance()->setRootDir(cacheDir);
 }
@@ -315,10 +319,10 @@ int main(int argc, char *argv[]) {
   QApplication a(argc, argv);
 
 #ifdef MACOSX
-  // This workaround is to avoid missing left button problem on Qt5.6.0.
-  // To invalidate m_rightButtonClicked in Qt/qnsview.mm, sending
-  // NSLeftButtonDown event before NSLeftMouseDragged event propagated to
-  // QApplication. See more details in ../mousedragfilter/mousedragfilter.mm.
+// This workaround is to avoid missing left button problem on Qt5.6.0.
+// To invalidate m_rightButtonClicked in Qt/qnsview.mm, sending
+// NSLeftButtonDown event before NSLeftMouseDragged event propagated to
+// QApplication. See more details in ../mousedragfilter/mousedragfilter.mm.
 
 #include "mousedragfilter.h"
 
@@ -616,6 +620,11 @@ int main(int argc, char *argv[]) {
   /*-- Layoutファイル名をMainWindowのctorに渡す --*/
   MainWindow w(argumentLayoutFileName);
 
+#ifdef _WIN32
+  // http://doc.qt.io/qt-5/windows-issues.html#fullscreen-opengl-based-windows
+  QWindowsWindowFunctions::setHasBorderInFullScreen(w.windowHandle(), true);
+#endif
+
   splash.showMessage(offsetStr + "Loading style sheet ...", Qt::AlignCenter,
                      Qt::white);
   a.processEvents();