diff --git a/applets/brightness/brightness-applet.c b/applets/brightness/brightness-applet.c
index 94d3d218..121ce07a 100644
--- a/applets/brightness/brightness-applet.c
+++ b/applets/brightness/brightness-applet.c
@@ -691,11 +691,9 @@ gpm_applet_create_popup (GpmBrightnessApplet *applet)
 gboolean
 gpm_applet_popup_click_cb (GpmBrightnessApplet *applet, GdkEventButton *event)
 {
-	/* react only to left mouse button */
-	if (event->button != 1) {
-		return FALSE;
-	}
-	return gpm_applet_popup_cb (applet);
+	if (gdk_event_triggers_context_menu ((GdkEvent *) event))
+		return gpm_applet_popup_cb (applet);
+	return FALSE;
 }
 
 /**
diff --git a/applets/inhibit/inhibit-applet.c b/applets/inhibit/inhibit-applet.c
index ff6736f8..05505ba4 100644
--- a/applets/inhibit/inhibit-applet.c
+++ b/applets/inhibit/inhibit-applet.c
@@ -244,11 +244,9 @@ gpm_applet_update_tooltip (GpmInhibitApplet *applet)
 static gboolean
 gpm_applet_click_cb (GpmInhibitApplet *applet, GdkEventButton *event)
 {
-	/* react only to left mouse button */
-	if (event->button != 1) {
-		return FALSE;
-	}
-	return gpm_applet_switch_cb (applet);
+	if (gdk_event_triggers_context_menu ((GdkEvent *) event)
+		return gpm_applet_switch_cb (applet);
+	return FALSE;
 }
 
 /**