diff --git a/lib/WindowManager.js b/lib/WindowManager.js
index <HASH>..<HASH> 100644
--- a/lib/WindowManager.js
+++ b/lib/WindowManager.js
@@ -190,12 +190,22 @@ class WindowManager {
     }
 
     createWindow(editorPath, callback = NOOP, ...args) {
+        // First check if this editor is already loaded, if it is, do not do
+        // anything more, instead just focus that existing window
+        if (this.loadedEditorModules[editorPath]) {
+            const { windowInfo } = this.loadedEditorModules[editorPath];
+            const { browserWindow, windowID } = windowInfo;
+            browserWindow.show(); // force to bring to front & focus
+            callback();
+            return windowID;
+        }
+
         // If necessary, restore previous state
         if (this.opts.rememberWindowState) {
             this.setupRememberWindowState();
         }
 
-        // Actually create the new Browser window
+        // Actually create the new electron Browser instance
         const browserWindow = new this.electron.BrowserWindow(this.windowPrefs);
 
         // If necessary, set the window state manager to manage the current
preventing same file from getting loaded multiple times in different windows