diff --git a/src/common/config/index.js b/src/common/config/index.js
index 043ca541..5519f6a9 100644
--- a/src/common/config/index.js
+++ b/src/common/config/index.js
@@ -336,7 +336,7 @@ export default class Config extends EventEmitter {
         let newTeams = teams;
         const uniqueURLs = new Set();
         newTeams = newTeams.filter((team) => {
-            return uniqueURLs.has(team.url) ? false : uniqueURLs.add(team.url);
+            return uniqueURLs.has(`${team.name}:${team.url}`) ? false : uniqueURLs.add(`${team.name}:${team.url}`);
         });
         return newTeams;
     }
diff --git a/src/main/views/viewManager.js b/src/main/views/viewManager.js
index 8c7a3c8a..ea848987 100644
--- a/src/main/views/viewManager.js
+++ b/src/main/views/viewManager.js
@@ -72,7 +72,7 @@ export class ViewManager {
             if (recycle && recycle.isVisible) {
                 setFocus = recycle.name;
             }
-            if (recycle && recycle.server.url.toString() === urlUtils.parseURL(server.url).toString()) {
+            if (recycle && recycle.server.name === server.name && recycle.server.url.toString() === urlUtils.parseURL(server.url).toString()) {
                 oldviews.delete(recycle.name);
                 this.views.set(recycle.name, recycle);
             } else {