diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 72f87a7e8..13f88157c 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -467,7 +467,7 @@ do showUpgradeMessage = ->
             Settings.set "previousVersion", currentVersion
             chrome.notifications.onClicked.addListener (id) ->
               if id == notificationId
-                chrome.tabs.getSelected null, (tab) ->
+                chrome.tabs.query { active: true, currentWindow: true }, ([tab]) ->
                   TabOperations.openUrlInNewTab {tab, tabId: tab.id, url: "https://github.com/philc/vimium#release-notes"}
       else
         # We need to wait for the user to accept the "notifications" permission.
diff --git a/pages/options.coffee b/pages/options.coffee
index 0a71611ad..8683b7ed6 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -265,7 +265,7 @@ initOptionsPage = ->
   maintainLinkHintsView()
 
 initPopupPage = ->
-  chrome.tabs.getSelected null, (tab) ->
+  chrome.tabs.query { active: true, currentWindow: true }, ([tab]) ->
     exclusions = null
     document.getElementById("optionsLink").setAttribute "href", chrome.runtime.getURL("pages/options.html")