From 5bd18f1edc3530c1b40d51bd060e50217488a5e2 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Tue, 14 Aug 2018 20:14:13 -0400
Subject: [PATCH] fix "Element picker/zapper does not switch tabs" in
 https://github.com/uBlockOrigin/uBlock-issues/issues/168

---
 src/js/ublock.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/js/ublock.js b/src/js/ublock.js
index caaa320fd..d3d6349c5 100644
--- a/src/js/ublock.js
+++ b/src/js/ublock.js
@@ -400,10 +400,20 @@ var matchBucket = function(url, hostname, bucket, start) {
 
     this.epickerTarget = targetElement || '';
     this.epickerZap = zap || false;
-    vAPI.tabs.injectScript(tabId, {
-        file: '/js/scriptlets/element-picker.js',
-        runAt: 'document_end'
-    });
+
+    // https://github.com/uBlockOrigin/uBlock-issues/issues/168
+    //   Force activate the target tab once the element picker has been
+    //   injected.
+    vAPI.tabs.injectScript(
+        tabId,
+        {
+            file: '/js/scriptlets/element-picker.js',
+            runAt: 'document_end'
+        },
+        ( ) => {
+            vAPI.tabs.select(tabId);
+        }
+    );
 };
 
 /******************************************************************************/