diff --git a/examples/eekboard-inscript/inscript.py b/examples/eekboard-inscript/inscript.py
index 1551c38a..47a26d9b 100644
--- a/examples/eekboard-inscript/inscript.py
+++ b/examples/eekboard-inscript/inscript.py
@@ -87,6 +87,7 @@ class Keyboard(gobject.GObject):
         }
 
     def __init__(self, client_name, map_path, kbd_path):
+        super(Keyboard, self).__init__()
         self.__keyboard = self.__create_keyboard(map_path, kbd_path)
         self.__eekboard = eekboard.Eekboard()
         self.__context = self.__eekboard.create_context(client_name)
@@ -149,13 +150,11 @@ class Keyboard(gobject.GObject):
         return keyboard
 
     def __destroyed_cb(self, *args):
-        # self.emit('quit')
-        gtk.main_quit()
+        self.emit('quit')
 
     def __notify_keyboard_visible_cb(self, obj, pspec):
         if not obj.get_property(pspec.name):
-            # self.emit('quit')
-            gtk.main_quit()
+            self.emit('quit')
 
     def enable(self):
         self.__eekboard.push_context(self.__context)
diff --git a/examples/eekboard-inscript/main.py b/examples/eekboard-inscript/main.py
index 2c4fd21c..6353267e 100644
--- a/examples/eekboard-inscript/main.py
+++ b/examples/eekboard-inscript/main.py
@@ -42,6 +42,7 @@ if not os.path.exists(kbd_path):
     exit(1)
 
 keyboard = inscript.Keyboard("eekboard-inscript", map_path, kbd_path)
+keyboard.connect('quit', lambda *args: gtk.main_quit())
 keyboard.set_group(1)
 keyboard.enable()
 keyboard.show()