diff --git a/src/Widgets/IndicatorEntry.vala b/src/Widgets/IndicatorEntry.vala
index 2ad9776..f68051d 100644
--- a/src/Widgets/IndicatorEntry.vala
+++ b/src/Widgets/IndicatorEntry.vala
@@ -59,6 +59,18 @@ public class Wingpanel.Widgets.IndicatorEntry : Gtk.MenuItem {
         this.add (revealer);
         revealer.add (display_widget);
 
+        if (indicator_widget == null) {
+            this.button_press_event.connect ((e) => {
+                popover_manager.close ();
+                display_widget.button_press_event (e);
+
+                return Gdk.EVENT_PROPAGATE;
+            });
+            set_reveal (base_indicator.visible);
+
+            return;
+        }
+
         if (base_indicator.visible) {
             popover_manager.register_indicator (this);
         }