diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am
index bfae229dec..2680ba05c7 100644
--- a/stepmania/src/Makefile.am
+++ b/stepmania/src/Makefile.am
@@ -180,7 +180,7 @@ Loading = arch/LoadingWindow/LoadingWindow_SDL.cpp \
 	  arch/LoadingWindow/LoadingWindow_Null.h
 
 if HAVE_GTK
-  Loading += arch/LoadingWindow/LoadingWindow_Gtk.c \
+  Loading += arch/LoadingWindow/LoadingWindow_Gtk.cpp \
 	     arch/LoadingWindow/LoadingWindow_Gtk.h
 endif
 
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.c b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp
similarity index 84%
rename from stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.c
rename to stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp
index faa294b740..86d6b1b30e 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.c
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp
@@ -1,5 +1,4 @@
 #include <gtk/gtk.h>
-#include "global.h"
 
 static GtkWidget *label;
 static GtkWidget *window;
@@ -7,8 +6,12 @@ static GtkWidget *window;
 void CreateGtkLoadingWindow() {
   GtkWidget *vbox;
   GtkWidget *loadimage;
+  char **argv;
+  int argc;
 
-  gtk_init(&g_argc,&g_argv);
+  argc = 1;
+  argv[0] = "stepmania";
+  gtk_init(&argc,&argv);
   loadimage = gtk_image_new_from_file("loading.xpm");
   label = gtk_label_new(NULL);
   gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_CENTER);
@@ -21,12 +24,14 @@ void CreateGtkLoadingWindow() {
   gtk_widget_show(label);
   gtk_widget_show(vbox);
   gtk_widget_show(window);
+  gtk_main();
 }
 
 void DestroyGtkLoadingWindow() {
-  gtk_widget_destroy(window);
+  gtk_main_quit();
 }
 
 void SetGtkLoadingWindowText(const char *s) {
   gtk_label_set_text(GTK_LABEL(label),s);
+  gtk_widget_show(label);
 }