diff --git a/preload.js b/preload.js
index ce7ef2f..5e5aeca 100644
--- a/preload.js
+++ b/preload.js
@@ -91,6 +91,8 @@ window.init = function init() {
     const deviceID = e.srcElement.id;
     if (e.srcElement.id !== 'device-list') {
       VIEW.switchDevice(deviceID);
+    } else {
+      VIEW.switchDevice(undefined);
     }
   };
 
@@ -125,22 +127,6 @@ window.init = function init() {
       }
     }
   };
-
-  document.getElementById('device-list-col').onclick = function deviceListClick(e) {
-    try {
-      document.querySelector('#device-list .active-device').classList.remove('active-device');
-      ipcRenderer.send('disableDeviceDropdown', '');
-    } catch (err) {
-      // console.log(err)
-    }
-    try {
-      document.getElementsByClassName('active-device-outline')[0].classList.remove('active-device-outline');
-    } catch (err) {
-      // console.log(err)
-    }
-
-    VIEW.switchDevice();
-  };
 };
 
 ipcRenderer.on('setActiveDevicePinned', (event, message) => {
diff --git a/src/device.js b/src/device.js
index 1fe2267..a6a54ea 100644
--- a/src/device.js
+++ b/src/device.js
@@ -343,7 +343,6 @@ function heartbeat() {
       d.sendQueue.shift();
     }
   });
-  document.getElementById('network-indicator-dot').style.background = '#111';
 }
 setInterval(heartbeat, 50);
 
diff --git a/src/view.js b/src/view.js
index be510fa..941a8f7 100644
--- a/src/view.js
+++ b/src/view.js
@@ -162,6 +162,10 @@ function switchDevice(id) {
   if (id === undefined) {
     document.getElementById('refresh-device-button').disabled = true;
     document.getElementById('device-settings-table').style.display = 'none';
+    const $activeDevice = document.querySelector('.active-device');
+    if ($activeDevice) {
+      $activeDevice.classList.remove('active-device');
+    }
     return;
   }