diff --git a/gsmartcontrol/Makefile.am b/gsmartcontrol/Makefile.am
index 4cd383f..ecb27fb 100644
--- a/gsmartcontrol/Makefile.am
+++ b/gsmartcontrol/Makefile.am
@@ -140,6 +140,7 @@ win-dist-prepare: all
 
 	for file in $(GTK_BIN_FILES); do for f in "@WINDOWS_SYSROOT@/bin/"$$file; do if test -f "$${f}"; then cp -p "$${f}" win-dist/; fi; done; done
 
+#	<prefix>/etc should contain gtk-3.0/settings.ini
 	$(MKDIR_P) win-dist/etc
 	$(MKDIR_P) win-dist/etc/fonts
 	cp -p "@WINDOWS_SYSROOT@"/etc/fonts/fonts.conf win-dist/etc/fonts
@@ -148,12 +149,14 @@ win-dist-prepare: all
 	$(MKDIR_P) win-dist/share
 	cp -p -r "@WINDOWS_SYSROOT@"/share/themes win-dist/share
 
+#	needed for file chooser
 	$(MKDIR_P) win-dist/share/glib-2.0
 	cp -p -r "@WINDOWS_SYSROOT@"/share/glib-2.0/schemas win-dist/share/glib-2.0
 
 # 	$(MKDIR_P) win-dist/share/icons
 # 	cp -p "@WINDOWS_SYSROOT@"/share/icons/hicolor win-dist/share/icons
 
+#	needed for window titlebar
 	$(MKDIR_P) win-dist/share/icons/Adwaita/16x16/actions
 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/16x16/actions/window-close-symbolic.symbolic.png win-dist/share/icons/Adwaita/16x16/actions
 	cp -p "@WINDOWS_SYSROOT@"/share/icons/Adwaita/16x16/actions/window-maximize-symbolic.symbolic.png win-dist/share/icons/Adwaita/16x16/actions
diff --git a/gsmartcontrol/src/gsc_init.cpp b/gsmartcontrol/src/gsc_init.cpp
index 87cbdf0..55c8570 100644
--- a/gsmartcontrol/src/gsc_init.cpp
+++ b/gsmartcontrol/src/gsc_init.cpp
@@ -30,6 +30,7 @@
 #include "hz/locale_tools.h"  // locale_c*
 #include "hz/string_algo.h"  // string_join()
 #include "hz/win32_tools.h"  // win32_get_registry_value_string()
+#include "hz/env_tools.h"
 
 #include "gsc_main_window.h"
 #include "gsc_executor_log_window.h"
@@ -305,6 +306,10 @@ bool app_init_and_loop(int& argc, char**& argv)
 	// initialize GThread (for mutexes, etc... to work). Must be called before any other glib function.
 // 	Glib::thread_init();
 
+#ifdef _WIN32
+	// Disable client-side decorations (enable native windows decorations) under Windows.
+	hz::env_set_value("GTK_CSD", "0");
+#endif
 
 	// Glib needs the C locale set to system locale for command line args.
 	// We will reset it later if needed.