2 files changed, 11 insertions, 2 deletions
diff --git a/instance-manager.js b/instance-manager.js
index 7d27a7e..96151ab 100644
--- a/instance-manager.js
+++ b/instance-manager.js
@@ -12,7 +12,7 @@ function createNewConnection() {
 
 function registerNewInstance(payload) {
   tabGroup.addTab({
-    title: payload.connectionName,
+    title: getTabTitle(payload.connectionConfig),
     src: "file://" + __dirname + "/editor-instance.html",
     visible: true,
     active: true,
@@ -28,6 +28,15 @@ function registerNewInstance(payload) {
   });
 }
 
+function getTabTitle(connectionConfig) {
+  if(connectionConfig.name) {
+    return connectionConfig.name;
+  }
+  else {
+    return connectionConfig.hostname + ":" + connectionConfig.port;
+  }
+}
+
 ipcRenderer.on("instanceManager.registerNewInstance", (event, payload) => {
   registerNewInstance(payload);
 });
diff --git a/main.js b/main.js
index 0b9495e..8a8842b 100644
--- a/main.js
+++ b/main.js
@@ -97,7 +97,7 @@ ipcMain.on("queryExecutor.initialiseConnectionCallback", (event, payload) => {
       queryExecutors.pop().close();
     }
     else{
-      uiWindow.webContents.send("instanceManager.registerNewInstance", { assignedQueryExecutorId: payload.executorId, connectionName: connectionConfig.name });
+      uiWindow.webContents.send("instanceManager.registerNewInstance", { assignedQueryExecutorId: payload.executorId, connectionConfig: connectionConfig });
       newConnectionDialog.close();
     }
   }