diff --git a/gnoemoe/dialogs/gm-world-paste-dialog.c b/gnoemoe/dialogs/gm-world-paste-dialog.c
index 886c801..d4f79de 100644
--- a/gnoemoe/dialogs/gm-world-paste-dialog.c
+++ b/gnoemoe/dialogs/gm-world-paste-dialog.c
@@ -299,26 +299,25 @@ gm_world_paste_dialog_do_paste() {
 static void
 on_gm_world_paste_dialog_response(GtkDialog *dialog, gint response,
 		gpointer user_data) {
-	if (response == GTK_RESPONSE_APPLY) {
+	if (response == GTK_RESPONSE_APPLY)
 		gm_world_paste_dialog_do_paste();
-	} else {
-		if (gm_world_paste_dialog_instance->model != NULL) {
-			g_object_ref(gm_world_paste_dialog_instance->model);
-			g_object_remove_toggle_ref(
-					G_OBJECT(gm_world_paste_dialog_instance->model),
-					gm_world_paste_dialog_remove_model, NULL);
-		}
 
-		g_signal_handlers_disconnect_by_func(
-				gm_world_paste_dialog_instance->view, 
-				G_CALLBACK(on_gm_world_paste_dialog_active_world_changed),
-				NULL);
+	if (gm_world_paste_dialog_instance->model != NULL) {
+		g_object_ref(gm_world_paste_dialog_instance->model);
+		g_object_remove_toggle_ref(
+				G_OBJECT(gm_world_paste_dialog_instance->model),
+				gm_world_paste_dialog_remove_model, NULL);
+	}
 
-	  	g_object_unref(gm_world_paste_dialog_instance->xml);
-  		gtk_widget_destroy(gm_world_paste_dialog_instance->dialog);
-	  	g_free(gm_world_paste_dialog_instance);
-  		gm_world_paste_dialog_instance = NULL;
-  	}
+	g_signal_handlers_disconnect_by_func(
+			gm_world_paste_dialog_instance->view, 
+			G_CALLBACK(on_gm_world_paste_dialog_active_world_changed),
+			NULL);
+
+  	g_object_unref(gm_world_paste_dialog_instance->xml);
+	gtk_widget_destroy(gm_world_paste_dialog_instance->dialog);
+  	g_free(gm_world_paste_dialog_instance);
+		gm_world_paste_dialog_instance = NULL;
 }
 
 static void 
diff --git a/ui/gm-world-paste.glade b/ui/gm-world-paste.glade
index 778b5f6..364387d 100644
--- a/ui/gm-world-paste.glade
+++ b/ui/gm-world-paste.glade
@@ -109,7 +109,7 @@
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
+		  <property name="xalign">1</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
@@ -137,7 +137,7 @@
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
+		  <property name="xalign">1</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>