diff --git a/frontend/src/pages/device/index.vue b/frontend/src/pages/device/index.vue
index 517c409a50..77c32e7c21 100644
--- a/frontend/src/pages/device/index.vue
+++ b/frontend/src/pages/device/index.vue
@@ -427,7 +427,7 @@ export default {
         },
         openEditor () {
             this.$store.dispatch('ux/validateUserAction', 'hasOpenedDeviceEditor')
-            window.open(this.deviceEditorURL, `device-editor-${this.device.id}`)
+            this.$router.push({ name: 'device-editor' })
         },
         async openTunnel (launchEditor = false) {
             try {