diff --git a/desmume/src/gtk-glade/callbacks.cpp b/desmume/src/gtk-glade/callbacks.cpp
index 26e8415df..bf0774958 100755
--- a/desmume/src/gtk-glade/callbacks.cpp
+++ b/desmume/src/gtk-glade/callbacks.cpp
@@ -27,6 +27,7 @@ int Frameskip = 0;
 gboolean ScreenRightForce=FALSE;
 gboolean ScreenRight=FALSE;
 gboolean ScreenGap=FALSE;
+gboolean ScreenNoGap=FALSE;
 gboolean ScreenInvert=FALSE;
 
 /* ******** Savestate menu items handling ******** */
@@ -121,6 +122,17 @@ void MAINWINDOW_RESIZE() {
 
 	/* sees whether we want a gap */
 	if (!ScreenGap) dim1 = dim2 = -1;
+
+	if (ScreenNoGap) {
+		gtk_widget_hide (spacer1);
+		gtk_widget_hide (spacer2);
+	}
+	else
+	{
+		gtk_widget_show (spacer1);
+		gtk_widget_show (spacer2);
+	}
+
 	if (ScreenRight == rotate) {
 		if (ScreenRight)
 			dim2 = -1;
@@ -393,6 +405,14 @@ void  on_menu_gapscreen_activate  (GtkMenuItem *menuitem, gpointer user_data) {
 	MAINWINDOW_RESIZE();
 }
 
+void on_menu_nogap_activate (GtkMenuItem *menuitem, gpointer user_data) {
+	/* we'll make both gaps visibility false */
+	ScreenNoGap = gtk_check_menu_item_get_active((GtkCheckMenuItem*)menuitem);
+
+	/* pack the window */
+	MAINWINDOW_RESIZE();
+}
+
 void  on_menu_rightscreen_activate  (GtkMenuItem *menuitem, gpointer user_data) {
 	ScreenRightForce=gtk_check_menu_item_get_active((GtkCheckMenuItem*)menuitem);
 	rightscreen(ScreenRightForce);
diff --git a/desmume/src/gtk-glade/callbacks.h b/desmume/src/gtk-glade/callbacks.h
index 391063ec3..71928d835 100755
--- a/desmume/src/gtk-glade/callbacks.h
+++ b/desmume/src/gtk-glade/callbacks.h
@@ -46,6 +46,7 @@ G_MODULE_EXPORT void  on_menu_controls_activate     (GtkMenuItem *menuitem, gpoi
 G_MODULE_EXPORT void  on_menu_joy_controls_activate (GtkMenuItem *menuitem, gpointer user_data);
 G_MODULE_EXPORT void  on_menu_audio_on_activate     (GtkMenuItem *menuitem, gpointer user_data);
 G_MODULE_EXPORT void  on_menu_gapscreen_activate    (GtkMenuItem *menuitem, gpointer user_data);
+G_MODULE_EXPORT void  on_menu_nogap_activate        (GtkMenuItem *menuitem, gpointer user_data);
 G_MODULE_EXPORT void  on_menu_rightscreen_activate  (GtkMenuItem *menuitem, gpointer user_data);
 G_MODULE_EXPORT void  on_menu_rotatescreen_activate (GtkMenuItem *menuitem, gpointer user_data);
 
diff --git a/desmume/src/gtk-glade/glade/DeSmuMe.glade b/desmume/src/gtk-glade/glade/DeSmuMe.glade
index 868bbbc27..2b8e3512e 100755
--- a/desmume/src/gtk-glade/glade/DeSmuMe.glade
+++ b/desmume/src/gtk-glade/glade/DeSmuMe.glade
@@ -692,6 +692,16 @@
 		    </widget>
 		  </child>
 
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="menu_nogap">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">No Gap</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="activate" handler="on_menu_nogap_activate" last_modification_time="Sat, 06 Jan 2007 23:32:56 GMT"/>
+		    </widget>
+		  </child>
+
 		  <child>
 		    <widget class="GtkCheckMenuItem" id="menu_rightscreen">
 		      <property name="visible">True</property>