diff --git a/src/js/index.js b/src/js/index.js
index 47e95f3..94ed419 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -9,6 +9,7 @@
 
     const { ipcRenderer, remote } = require('electron');
     const customTitlebar = require('custom-electron-titlebar');
+    const path = require("path");
 
     /**
      * @desc Main view class containing all rendering and
@@ -136,7 +137,7 @@
          * @param {*} pathName
          */
         _createTabElement(pathName) {
-            const filename = pathName.substring(pathName.lastIndexOf('\\') + 1);
+            const filename = path.basename(pathName);
             const tabElement = document.createElement('div');
             const labelElement = document.createElement('div');
             const closeElement = document.createElement('div');
@@ -316,8 +317,9 @@
             }
 
             // Switch to tab if already open
-            if (this._paths.indexOf(pathName) >= 0) {
-                this._switchTab(this._tabs[this._paths.indexOf(pathName)]);
+            let itab = this._paths.indexOf(pathName);
+            if (itab >= 0) {
+                this._switchTab(this._tabs[itab]);
                 return;
             }