--- a/mobile/android/components/extensions/ext-pageAction.js
+++ b/mobile/android/components/extensions/ext-pageAction.js
@@ -36,17 +36,17 @@ function PageAction(options, extension) 
     clickCallback: () => {
       if (this.popupUrl) {
         let win = Services.wm.getMostRecentWindow("navigator:browser");
         win.BrowserApp.addTab(this.popupUrl, {
           selected: true,
           parentId: win.BrowserApp.selectedTab.id,
         });
       } else {
-        this.emit("click");
+        this.emit("click", tabTracker.activeTab);
       }
     },
   };
 
   this.shouldShow = false;
 
   EventEmitter.decorate(this);
 }
@@ -122,22 +122,24 @@ extensions.on("shutdown", (type, extensi
   if (pageActionMap.has(extension)) {
     pageActionMap.get(extension).shutdown();
     pageActionMap.delete(extension);
   }
 });
 /* eslint-enable mozilla/balanced-listeners */
 
 extensions.registerSchemaAPI("pageAction", "addon_parent", context => {
-  let {extension} = context;
+  const {extension} = context;
+  const {tabManager} = extension;
+
   return {
     pageAction: {
       onClicked: new SingletonEventManager(context, "pageAction.onClicked", fire => {
-        let listener = (event) => {
-          fire.async();
+        let listener = (event, tab) => {
+          fire.async(tabManager.convert(tab));
         };
         pageActionMap.get(extension).on("click", listener);
         return () => {
           pageActionMap.get(extension).off("click", listener);
         };
       }).api(),
 
       show(tabId) {

--- a/mobile/android/components/extensions/test/mochitest/test_ext_pageAction.html
+++ b/mobile/android/components/extensions/test/mochitest/test_ext_pageAction.html
@@ -13,49 +13,49 @@
 <script type="text/javascript">
 "use strict";
 
 let dataURI = "iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAC4klEQVRYhdWXLWzbQBSADQtDAwsHC1tUhUxqfL67lk2tdn+OJg0ODU0rLByqgqINBY6tmlbn7LMTJ5FaFVVBk1G0oUGjG2jT2Y7jxmmcbU/6iJ+f36fz+e5sGP9riCGm9hB37RG+scd4Yo/wsDXCZyIE2xuXsce4bY+wXkAsQtzYmExrfFgvkJkRbkzo1ehoxx5iXcgI/9iYUGt8WH9MqDXEcmNChmEYrRCf2SHWeYgQx3x0tLNRIeKQLTtEFyJEep4NTuhk8BC+yMrwEE3+iozo42d8gK7FAOkMsRiiN8QhW2ttSK5QTfRRV4QoymVeJMvPvDp7gCZigD613MN6yRFA3SWarow9QB9LCfG+NeF9qCtjAKOSQjCqVKhfVsiHEQ+grgx/lRGqUihAc1uL8EFD+KCRO+GrF4J61phcoRoPoEzkYhZYpykh5sMb7kOdIeY+jHKur4QI4Feh4AFX1nVeLxrAvQchGsBz5ls6wa2QdwcvIcE2863bTH79KOvsz/uUYJsp+J0pSzNlDckVqqVGUAF+n6uS7txcOl6wot4JVy70ufDLy4pWLUQVPE81pRI0mGe9oxLMHSeohHvMs/STUNaUK6vDPCvOyxMFDx4achehRDJmHnydnkPww5OFfLxrGIZBFDyYl4LpMzlTQFIP6AQx86w2UeYBccFpJrcKv5L9eGDtUAU6RIELqsB74uynjy/UBRF1gS5BTFxwQT1wTiXoUg9MH7m/3NZRRoi5IJytUbMgzv4Wc832+oQkiKgEehmyMkkpKsFkQV11QsRJL5rJYBLItQgRaUZEmnoZXsomz3vGiWw+I9KMF9SVFOqZEemZekli1jN3U/UOqhHHvC6oWWGElhfSpGdOk6+O9prdwvtLj5BjRsQxdRnot+Zeifpy/2/0stktKTRNLmbk0mwXyl8253fyojj+8rxOHNAhjjm5n0/5OOCGOKBzkrMO0Z75lvSAzKlrF32Z/3z8BqLAn+yMV7VhAAAAAElFTkSuQmCC";
 
 let image = atob(dataURI);
 const IMAGE_ARRAYBUFFER = Uint8Array.from(image, byte => byte.charCodeAt(0)).buffer;
 
-function background() {
+async function background() {
   browser.test.assertTrue("pageAction" in browser, "Namespace 'pageAction' exists in browser");
   browser.test.assertTrue("show" in browser.pageAction, "API method 'show' exists in browser.pageAction");
 
-  // TODO: Use the Tabs API to obtain the tab ids for showing pageActions.
-  let tabId = 1;
+  const tabs = await browser.tabs.query({active: true, currentWindow: true});
+
   browser.test.onMessage.addListener(msg => {
     if (msg === "pageAction-show") {
-      browser.pageAction.show(tabId).then(() => {
+      browser.pageAction.show(tabs[0].id).then(() => {
         browser.test.sendMessage("page-action-shown");
       });
     } else if (msg === "pageAction-hide") {
-      browser.pageAction.hide(tabId).then(() => {
+      browser.pageAction.hide(tabs[0].id).then(() => {
         browser.test.sendMessage("page-action-hidden");
       });
     }
   });
 
   browser.pageAction.onClicked.addListener(tab => {
-    // TODO: Make sure we get the correct tab once basic tabs support is added.
-    browser.test.sendMessage("page-action-clicked");
+    browser.test.sendMessage("page-action-clicked", tab);
   });
 
-  let extensionInfo = {
+  const extensionInfo = {
     // Extract the assigned uuid from the background page url.
     uuid: `{${window.location.hostname}}`,
+    tab: tabs[0],
   };
 
   browser.test.sendMessage("ready", extensionInfo);
 }
 
 add_task(function* test_pageAction() {
-  let extension = ExtensionTestUtils.loadExtension({
+  const extension = ExtensionTestUtils.loadExtension({
     background,
     manifest: {
       "name": "PageAction Extension",
       "page_action": {
         "default_title": "Page Action",
         "default_icon": {
           "18": "extension.png",
         },
@@ -67,33 +67,34 @@ add_task(function* test_pageAction() {
       },
     },
     files: {
       "extension.png": IMAGE_ARRAYBUFFER,
     },
   });
 
   yield extension.startup();
-  let {uuid} = yield extension.awaitMessage("ready");
+  const {uuid, tab} = yield extension.awaitMessage("ready");
 
   extension.sendMessage("pageAction-show");
   yield extension.awaitMessage("page-action-shown");
   ok(isPageActionShown(uuid), "The PageAction should be shown");
 
   extension.sendMessage("pageAction-hide");
   yield extension.awaitMessage("page-action-hidden");
   ok(!isPageActionShown(uuid), "The PageAction should be hidden");
 
   extension.sendMessage("pageAction-show");
   yield extension.awaitMessage("page-action-shown");
   ok(isPageActionShown(uuid), "The PageAction should be shown");
 
   clickPageAction(uuid);
-  yield extension.awaitMessage("page-action-clicked");
+  const clickedTab = yield extension.awaitMessage("page-action-clicked");
   ok(isPageActionShown(uuid), "The PageAction should still be shown after being clicked");
+  is(clickedTab.id, tab.id, "Got the expected tab id in the pageAction.onClicked event");
 
   yield extension.unload();
   ok(!isPageActionShown(uuid), "The PageAction should be removed after unload");
 });
 </script>
 
 </body>
 </html>