diff --git a/source/linux/cheats.cpp b/source/linux/cheats.cpp
index bb6d3c7b..feb6e0e6 100644
--- a/source/linux/cheats.cpp
+++ b/source/linux/cheats.cpp
@@ -393,6 +393,9 @@ GtkWidget* create_cheatwindow (void) {
 	gtk_widget_show (chdelete);
 	gtk_fixed_put (GTK_FIXED (cheatfixed), chdelete, 8, 240);
 	gtk_widget_set_size_request (chdelete, 120, 32);
+	
+	g_signal_connect(G_OBJECT(cheatwindow), "destroy",
+		G_CALLBACK(on_cheatok_clicked), NULL);
 
 	g_signal_connect(G_OBJECT(chtggvalid), "clicked",
 		G_CALLBACK(on_chtggvalid_clicked), NULL);
diff --git a/source/linux/uihelp.cpp b/source/linux/uihelp.cpp
index e00d2523..2131d5c7 100644
--- a/source/linux/uihelp.cpp
+++ b/source/linux/uihelp.cpp
@@ -863,6 +863,13 @@ GtkWidget* create_config(void) {
 	GdkPixbuf *app_icon = get_icon();
 	gtk_window_set_icon(GTK_WINDOW(configwindow), app_icon);
 	
+	//Config
+	g_signal_connect(G_OBJECT(okbutton), "clicked",
+		G_CALLBACK(on_okbutton_clicked), NULL);
+
+	g_signal_connect(G_OBJECT(configwindow), "destroy",
+		G_CALLBACK(on_okbutton_clicked), NULL);
+	
 	//Video
 	g_signal_connect(G_OBJECT(scaleamtcombo), "changed",
 		G_CALLBACK(on_scaleamtcombo_changed), NULL);
@@ -887,10 +894,7 @@ GtkWidget* create_config(void) {
 
 	g_signal_connect(G_OBJECT(rendercombo), "changed",
 		G_CALLBACK(on_rendercombo_changed), NULL);
-		
-	g_signal_connect(G_OBJECT(okbutton), "clicked",
-		G_CALLBACK(on_okbutton_clicked), NULL);
-		
+
 	//Audio
 	g_signal_connect(G_OBJECT(volumescroll), "value_changed",
 		G_CALLBACK(on_volumescroll_value_changed), NULL);