@@ -14,10 +14,10 @@ for (r in rs) {
 }
 */
 
-// If a ruleset could apply to a tab, then add the little HTTPS
-// Everywhere icon to the address bar.
+// Add the HTTPS Everywhere icon to the URL address bar.
+// TODO: Switch from pageAction to browserAction?
 function displayPageAction(tabId) {
-  if (tabId !== -1 && this.activeRulesets.getRulesets(tabId)) {
+  if (tabId !== -1) {
     chrome.tabs.get(tabId, function(tab) {
       if(typeof(tab) === "undefined") {
         log(DBUG, "Not a real tab. Skipping showing pageAction.");
@@ -242,32 +242,20 @@ wr.onBeforeSendHeaders.addListener(onBeforeSendHeaders, {urls: ["http://*/*"]},
 wr.onResponseStarted.addListener(onResponseStarted,
                                  {urls: ["https://*/*", "http://*/*"]});
 
-// Add the small HTTPS Everywhere icon in the address bar if any rules apply to this tab.
+
+// Add the small HTTPS Everywhere icon in the address bar.
+// Note: We can't use any other hook (onCreated, onActivated, etc.) because Chrome resets the
+// pageActions on URL change. We should strongly consider switching from pageAction to browserAction.
 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
     displayPageAction(tabId);
 });
 
+// Pre-rendered tabs / instant experiments sometimes skip onUpdated.
+// See http://crbug.com/109557
+chrome.tabs.onReplaced.addListener(function(addedTabId, removedTabId) {
+    displayPageAction(addedTabId);
+});
+
 // Listen for cookies set/updated and secure them if applicable. This function is async/nonblocking,
 // so we also use onBeforeSendHeaders to prevent a small window where cookies could be stolen.
 chrome.cookies.onChanged.addListener(onCookieChanged);
-
-
-// Intermittently call displayPageAction(). chrome.tabs.onUpdated (above) adds the HTTPS Everywhere icon
-// via displayPageAction to 99.9% of pages. In the /rare/ case where /absolutely no elements/ of a tab have
-// any applicable rulesets, but the page later loads one (without triggering chrome.tabs.onUpdated), this will
-// add the HTTPS Everywhere icon.
-//
-// In practice, this is incredibly rare. If people don't mind the HTTPS Everywhere icon being always visible in
-// either the address bar or via pageAction, we could consider having it /always/ visible (it usually is anyway),
-// or adding a browser_action instead, which would change the UI/UX slightly.
-function periodically_displayPageAction() {
-    // Get all available active tabs
-    chrome.tabs.query({active: true},
-        function(tabs_array) {
-            // Pass active tabIDs to displayPageAction
-            tabs_array.map(function(tab){return tab.id}).map(displayPageAction);
-        } );
-    // Call ourself every 10 seconds.
-    setTimeout(periodically_displayPageAction, 10000);
-}
-periodically_displayPageAction();