diff --git a/src/dialogs/load.c b/src/dialogs/load.c
index 4d35312..e0a8f59 100644
--- a/src/dialogs/load.c
+++ b/src/dialogs/load.c
@@ -136,7 +136,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
  	// 1 - Charset  xxxxxxxxx.xxxxxxxxx.  Format: xxxxxxxxx.xxxxxxxxx.
 
 
-	gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
+//	gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
 
 	// Setup visual elements
 	// https://developer.gnome.org/hig/stable/visual-layout.html.en
@@ -145,7 +145,10 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 
 	GtkBox * box = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog)));
 	gtk_window_set_resizable(GTK_WINDOW(dialog),FALSE);
+
+#if G_OS_UNIX
 	gtk_container_set_border_width(GTK_CONTAINER(box),18);
+#endif // UNIX
 
 	GtkGrid * grid = GTK_GRID(gtk_grid_new());
 	gtk_grid_set_row_spacing(GTK_GRID(grid),6);
diff --git a/src/dialogs/save/save.c b/src/dialogs/save/save.c
index 779d205..7e0774a 100644
--- a/src/dialogs/save/save.c
+++ b/src/dialogs/save/save.c
@@ -165,7 +165,7 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 
 	dialog->mode = LIB3270_CONTENT_ALL;
 
-	gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
+	// gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);
 
 	// Setup visual elements
 	// https://developer.gnome.org/hig/stable/visual-layout.html.en
@@ -174,7 +174,10 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
 
 	GtkBox * box = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog)));
 	gtk_window_set_resizable(GTK_WINDOW(dialog),FALSE);
+
+#if G_OS_UNIX
 	gtk_container_set_border_width(GTK_CONTAINER(box),18);
+#endif // LINUX
 
 	GtkGrid * grid = GTK_GRID(gtk_grid_new());
 	gtk_grid_set_row_spacing(GTK_GRID(grid),6);
diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c
index 2823166..ab9692b 100644
--- a/src/testprogram/testprogram.c
+++ b/src/testprogram/testprogram.c
@@ -201,6 +201,11 @@ int main (int argc, char **argv) {
 	setlocale( LC_ALL, "" );
 #endif
 
+#ifdef _WIN32
+	// https://stackoverflow.com/questions/37035936/how-to-get-native-windows-decorations-on-gtk3-on-windows-7-and-msys2
+	putenv("GTK_CSD=0");
+#endif // _WIN32
+
 	textdomain("libv3270");
 
 	app = gtk_application_new ("br.com.bb.libv3270",G_APPLICATION_FLAGS_NONE);
--
libgit2 0.21.2