diff --git a/src/sugar3/activity/webactivity.py b/src/sugar3/activity/webactivity.py
index 5ba17cea..8952813a 100644
--- a/src/sugar3/activity/webactivity.py
+++ b/src/sugar3/activity/webactivity.py
@@ -44,6 +44,7 @@ class WebActivity(Gtk.Window):
 
         self.connect("key-press-event", self._key_press_event_cb)
         self.connect('realize', self._realize_cb)
+        self.connect('destroy', self._destroy_cb)
 
         context = WebKit2.WebContext.get_default()
         context.register_uri_scheme("activity", self._app_scheme_cb, None)
@@ -69,6 +70,10 @@ class WebActivity(Gtk.Window):
         SugarExt.wm_set_bundle_id(xid, self._bundle_id)
         SugarExt.wm_set_activity_id(xid, str(self._activity_id))
 
+    def _destroy_cb(self, window):
+        self.destroy()
+        Gtk.main_quit()
+
     def _loading_changed_cb(self, web_view, load_event):
         if load_event == WebKit2.LoadEvent.FINISHED:
             key = os.environ["SUGAR_APISOCKET_KEY"]