diff --git a/src/kiri/conf.js b/src/kiri/conf.js
index 69d58f7e..2d9d865d 100644
--- a/src/kiri/conf.js
+++ b/src/kiri/conf.js
@@ -606,7 +606,6 @@
                 dark: false,
                 expert: true,
                 decals: true,
-                // hoverPop: false,
                 zoomSpeed: 1.0,
                 lineType: "path",
                 autoSave: true,
diff --git a/src/kiri/init.js b/src/kiri/init.js
index eeff4d73..384294e3 100644
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@@ -135,7 +135,6 @@
         let isDark = control.dark;
         control.expert = UI.expert.checked;
         control.decals = UI.decals.checked;
-        // control.hoverPop = UI.hoverPop.checked;
         control.showOrigin = UI.showOrigin.checked;
         control.showRulers = UI.showRulers.checked;
         control.autoLayout = UI.autoLayout.checked;
@@ -962,7 +961,7 @@
             opt.onclick = function() {
                 selectDevice(device);
                 opt.classList.add("selected");
-                if (found) {
+                if (found && found !== opt) {
                     found.classList.remove("selected");
                 }
                 found = opt;
@@ -973,6 +972,8 @@
                 UI.deviceList.appendChild(opt);
             }
             if (device === selected) {
+                // scroll to highlighted selection
+                setTimeout(() => UI.deviceList.scrollTop = opt.offsetTop, 0);
                 opt.classList.add("selected");
                 selectedIndex = incr;
                 found = opt;
@@ -1534,7 +1535,6 @@
             ], {class:"ext-buttons f-row"}),
 
             lprefs:           UC.newGroup(LANG.op_menu, $('prefs-gen1'), {inline: true}),
-            // hoverPop:         UC.newBoolean(LANG.op_hopo_s, booleanSave, {title:LANG.op_hopo_l}),
             reverseZoom:      UC.newBoolean(LANG.op_invr_s, booleanSave, {title:LANG.op_invr_l}),
             dark:             UC.newBoolean(LANG.op_dark_s, booleanSave, {title:LANG.op_dark_l}),
             decals:           UC.newBoolean(LANG.op_decl_s, booleanSave, {title:LANG.op_decl_s}),
diff --git a/src/kiri/ui.js b/src/kiri/ui.js
index 393b467c..eb281035 100644
--- a/src/kiri/ui.js
+++ b/src/kiri/ui.js
@@ -470,7 +470,6 @@
                     cols = Math.max(cols, row.length);
                 });
                 txt.setAttribute("cols", Math.max(30, cols + 1));
-                // txt.setAttribute("rows", Math.max(10, rows.length + 1));
 
                 let showing = btn === lastBtn;
                 hidePop();
@@ -535,7 +534,6 @@
                     cols = Math.max(cols, row.length);
                 });
                 txt.setAttribute("cols", Math.max(30, cols + 1));
-                // txt.setAttribute("rows", Math.max(10, rows.length + 1));
 
                 let showing = pop === lastPop;
                 hidePop();