Index: src/ephy-window.c
===================================================================
--- src/ephy-window.c	(revision 6810)
+++ src/ephy-window.c	(working copy)
@@ -1589,11 +1589,27 @@ sync_tab_popup_windows (EphyTab *tab,
 {
 	guint num_popups = 0;
 	char *tooltip = NULL;
+	GtkAction *action;
+	gboolean popups_allowed, popups_allowed_in_conf, sensivity;
 
 	g_object_get (G_OBJECT (tab),
 		      "hidden-popup-count", &num_popups,
 		      NULL);
 
+	g_object_get (G_OBJECT (tab),
+		      "popups-allowed", &popups_allowed,
+		      NULL);
+
+	popups_allowed_in_conf = eel_gconf_get_boolean (CONF_SECURITY_ALLOW_POPUPS);
+
+	/* Make sensitive if there are popups blocked, 
+	 * if they are allowed (so we can select this to block them) and 
+	 * if they are globally allowed (so we can block for a single site) */
+	sensivity = ((num_popups > 0) || popups_allowed || popups_allowed_in_conf);
+
+	action = gtk_action_group_get_action (window->priv->action_group, "ViewPopupWindows");
+	gtk_action_set_sensitive (action, sensivity);
+
 	if (num_popups > 0)
 	{
 		tooltip = g_strdup_printf (ngettext ("%d hidden popup window",
