diff --git a/client/js/keybinds.js b/client/js/keybinds.js
index a8b0d570..a9469f49 100644
--- a/client/js/keybinds.js
+++ b/client/js/keybinds.js
@@ -3,6 +3,7 @@
 const $ = require("jquery");
 const Mousetrap = require("mousetrap");
 const wrapCursor = require("undate").wrapCursor;
+const utils = require("./utils");
 const input = $("#input");
 const sidebar = $("#sidebar");
 const windows = $("#windows");
@@ -54,7 +55,8 @@ Mousetrap.bind([
 		break;
 	}
 
-	channels.eq(target).click();
+	target = channels.eq(target).click();
+	utils.scrollIntoViewNicely(target[0]);
 
 	return false;
 });
@@ -88,7 +90,8 @@ Mousetrap.bind([
 		break;
 	}
 
-	lobbies.eq(target).click();
+	target = lobbies.eq(target).click();
+	utils.scrollIntoViewNicely(target[0]);
 
 	return false;
 });
diff --git a/client/js/lounge.js b/client/js/lounge.js
index d427b7a4..99860fd1 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -378,8 +378,6 @@ $(function() {
 				utils.toggleNotificationMarkers(false);
 			}
 
-			utils.scrollIntoViewNicely(self[0]);
-
 			if ($(window).outerWidth() < utils.mobileViewportPixels) {
 				slideoutMenu.toggle(false);
 			}