diff --git a/frontend/src/ts/elements/commandline.ts b/frontend/src/ts/elements/commandline.ts
index 9174707da..149f0d54b 100644
--- a/frontend/src/ts/elements/commandline.ts
+++ b/frontend/src/ts/elements/commandline.ts
@@ -11,6 +11,7 @@ import { Auth } from "../firebase";
 import { isAnyPopupVisible } from "../utils/misc";
 
 let commandLineMouseMode = false;
+let themeChosen = false;
 
 function showInput(
   command: string,
@@ -164,6 +165,7 @@ function updateSuggested(): void {
 }
 
 export let show = (): void => {
+  themeChosen = false;
   if (!$(".page.pageLoading").hasClass("hidden")) return;
   Focus.set(false);
   $("#commandLine").removeClass("hidden");
@@ -481,7 +483,7 @@ $("#commandLineWrapper #commandLine .suggestions").on("mouseover", (e) => {
         if (!/font/gi.test(obj.id)) {
           UpdateConfig.previewFontFamily(Config.fontFamily);
         }
-        if (obj.hover) obj.hover();
+        if (obj.hover && !themeChosen) obj.hover();
       }
     });
   } catch (e) {}
@@ -491,6 +493,7 @@ $(document).on(
   "click",
   "#commandLineWrapper #commandLine .suggestions .entry",
   (e) => {
+    themeChosen = true;
     $(".suggestions .entry").removeClass("activeKeyboard");
     trigger($(e.currentTarget).attr("command") as string);
   }