diff --git a/schemas/windows/application.gschema.xml.in b/schemas/windows/application.gschema.xml.in
index be3961c..8a3b5b6 100644
--- a/schemas/windows/application.gschema.xml.in
+++ b/schemas/windows/application.gschema.xml.in
@@ -38,6 +38,12 @@
       <description>The ID of the current user interface style</description>
     </key>
 
+    <key name="gtk-csd" type="i">
+      <default>-1</default>
+      <summary>GTK CSD</summary>
+      <description>Gtk Client side decorations</description>
+    </key>
+
   </schema>
 
 </schemalist>
diff --git a/src/main/main.c b/src/main/main.c
index 72b2dea..62f7e5e 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -89,9 +89,6 @@ int main (int argc, char **argv) {
 		g_autofree gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL);
 		g_autofree gchar * locdir = g_build_filename(appdir,"locale",NULL);
 		bindtextdomain( PACKAGE_NAME, locdir );
-
-		// https://stackoverflow.com/questions/37035936/how-to-get-native-windows-decorations-on-gtk3-on-windows-7-and-msys2
-		putenv("GTK_CSD=0");
 	}
 #endif // _WIN32
 
diff --git a/src/objects/application/application.c b/src/objects/application/application.c
index 2045939..01bb3d8 100644
--- a/src/objects/application/application.c
+++ b/src/objects/application/application.c
@@ -207,6 +207,13 @@
 
 		g_settings_schema_source_unref(source);
 
+		// https://stackoverflow.com/questions/37035936/how-to-get-native-windows-decorations-on-gtk3-on-windows-7-and-msys2
+		int gtk_csd = g_settings_get_int(app->settings,"gtk-csd");
+		if(gtk_csd != -1) {
+			g_autofree gchar * env = g_strdup_printf("GTK_CSD=%d",gtk_csd);
+			putenv(env);
+		}
+
 #else
 
 		app->settings = g_settings_new_with_path("br.com.bb." PACKAGE_NAME, path);
--
libgit2 0.21.2