diff --git a/src/ObjectDialog.vala b/src/ObjectDialog.vala
index 77e2be9..061c675 100644
--- a/src/ObjectDialog.vala
+++ b/src/ObjectDialog.vala
@@ -16,17 +16,23 @@ namespace LAview.Core.Plugins {
 				dialog.modal = true;
 				//dialog.application = application;
 				dialog.delete_event.connect ((source) => {return true;});
+					dialog.hide_on_delete ();
 			}
 
-			dialog.response.connect ((response_id) => {
-				if (response_id == Gtk.ResponseType.CANCEL || response_id == Gtk.ResponseType.DELETE_EVENT) {
-					dialog.hide_on_delete ();
-				}
-			});
+			//dialog.response.connect ((response_id) => {
+			//	if (response_id == Gtk.ResponseType.CANCEL || response_id == Gtk.ResponseType.DELETE_EVENT) {
+			//		dialog.hide_on_delete ();
+			//	}
+			//});
 		}
 
 		public void show_all () {
 			dialog.show_all ();
 		}
+
+		[CCode (instance_pos = -1)]
+		public void button_ok_clicked (Button button) {
+			dialog.hide_on_delete ();
+		}
 	}
 }
diff --git a/ui/glade/laview-plugin-object-example.glade b/ui/glade/laview-plugin-object-example.glade
index 80927ca..c4d309e 100644
--- a/ui/glade/laview-plugin-object-example.glade
+++ b/ui/glade/laview-plugin-object-example.glade
@@ -15,7 +15,7 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button3">
+              <object class="GtkButton" id="button_apply">
                 <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -29,7 +29,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button1">
+              <object class="GtkButton" id="button_ok">
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -43,12 +43,13 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button2">
+              <object class="GtkButton" id="button_cancel">
                 <property name="label">gtk-undo</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
+                <signal name="activate" handler="l" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">True</property>