diff --git a/desmume/src/gtk-glade/main.cpp b/desmume/src/gtk-glade/main.cpp
index ebeb2aa30..b12893802 100755
--- a/desmume/src/gtk-glade/main.cpp
+++ b/desmume/src/gtk-glade/main.cpp
@@ -404,6 +404,8 @@ common_gtk_glade_main( struct configured_features *my_config) {
          * where the cpus are set up.
          */
 #ifdef GDB_STUB
+    gdbstub_mutex_init();
+
     gdbstub_handle_t arm9_gdb_stub = NULL;
     gdbstub_handle_t arm7_gdb_stub = NULL;
     
@@ -518,6 +520,8 @@ common_gtk_glade_main( struct configured_features *my_config) {
 	
     destroyStub_gdb( arm7_gdb_stub);
 	arm7_gdb_stub = NULL;
+
+    gdbstub_mutex_destroy();
 #endif
 
         /* Unload joystick */