2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d440b080..c601e2ac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- workaround X11 hanging if one right click on status icon without
+  having closed the notification (mga#12280)
+
 Version 3.5 - 8 January 2014, Thierry Vignaud
 
 - delay setting SIG_CHLD handler
diff --git a/mgaapplet b/mgaapplet
index 8f928d10..44240e6a 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -690,7 +690,9 @@ sub setState {
         }
 
         $bubble->set_urgency($state{$state}{urgency}) if $state{$state}{urgency};
-        $bubble->set_timeout(5000);
+        my $timeout = 5000;
+        $bubble->set_timeout($timeout);
+        Glib::Timeout->add($timeout, sub { Gtk3->main_quit; 0 });
         eval { $bubble->show; Gtk3->main };
         warn ">> ERR:$@" if $@;
     }