2 files changed, 8 insertions, 5 deletions

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 652647470..210a6ab6b 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -41,9 +41,14 @@ class ServiceWebview extends Component {
 
   refocusWebview = () => {
     const { webview } = this;
+    debug('Refocus Webview is called', this.props.service);
     if (!webview) return;
-    webview.view.blur();
-    webview.view.focus();
+    if (this.props.service.isActive) {
+      webview.view.blur();
+      webview.view.focus();
+    } else {
+      debug('Refocus not required - Not active service');
+    }
   };
 
   render() {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index b595c3543..0ad523374 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -495,9 +495,7 @@ export default class ServicesStore extends Store {
     const service = this.one(serviceId);
 
     if (service.webview) {
-      if (document.activeElement) {
-        document.activeElement.blur();
-      }
+      service.webview.blur();
       service.webview.focus();
     }
   }