diff --git a/lib/browser/api/menu.js b/lib/browser/api/menu.js
index 64397ce6a8ee..a68383cfd65c 100644
--- a/lib/browser/api/menu.js
+++ b/lib/browser/api/menu.js
@@ -118,7 +118,6 @@ Menu.prototype._init = function () {
     executeCommand: (event, commandId) => {
       const command = this.commandsMap[commandId]
       if (command == null) return
-
       command.click(event, BrowserWindow.getFocusedWindow(), webContents.getFocusedWebContents())
     },
     menuWillShow: () => {
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 8da8a2bd6960..c17206426aad 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -251,12 +251,10 @@ module.exports = {
     let focused = null
     for (let contents of getAllWebContents()) {
       if (!contents.isFocused()) continue
-
+      if (focused == null) focused = contents
       // Return webview web contents which may be embedded inside another
       // web contents that is also reporting as focused
       if (contents.getType() === 'webview') return contents
-
-      if (focused == null) focused = contents
     }
     return focused
   }