diff --git a/frontend/src/js/controllers/account-controller.js b/frontend/src/js/controllers/account-controller.js
index 567b1247d..d81a9ab6e 100644
--- a/frontend/src/js/controllers/account-controller.js
+++ b/frontend/src/js/controllers/account-controller.js
@@ -2,7 +2,6 @@ import * as Notifications from "../elements/notifications";
 import Config, * as UpdateConfig from "../config";
 import * as AccountButton from "../elements/account-button";
 import * as Account from "../pages/account";
-import * as CommandlineLists from "../elements/commandline-lists";
 import * as VerificationController from "./verification-controller";
 import * as Misc from "../misc";
 import * as Settings from "../pages/settings";
@@ -55,7 +54,6 @@ async function loadUser(user) {
   $(".pageLogin .preloader").addClass("hidden");
 
   // showFavouriteThemesAtTheTop();
-  CommandlineLists.updateThemeCommands();
 
   let text = "Account created on " + user.metadata.creationTime;
 
diff --git a/frontend/src/js/elements/commandline.js b/frontend/src/js/elements/commandline.js
index 9bebd36a8..8c44d8599 100644
--- a/frontend/src/js/elements/commandline.js
+++ b/frontend/src/js/elements/commandline.js
@@ -166,6 +166,7 @@ export let show = () => {
       );
   }
   $("#commandLine input").val("");
+  CommandlineLists.updateThemeCommands();
   updateSuggested();
   $("#commandLine input").focus();
 };
diff --git a/frontend/src/js/settings/theme-picker.js b/frontend/src/js/settings/theme-picker.js
index 1ba9c45bb..c5aadfc91 100644
--- a/frontend/src/js/settings/theme-picker.js
+++ b/frontend/src/js/settings/theme-picker.js
@@ -2,7 +2,6 @@ import Config, * as UpdateConfig from "../config";
 import * as ThemeController from "../controllers/theme-controller";
 import * as Misc from "../misc";
 import * as Notifications from "../elements/notifications";
-import * as CommandlineLists from "../elements/commandline-lists";
 import * as ThemeColors from "../elements/theme-colors";
 import * as ChartController from "../controllers/chart-controller";
 
@@ -165,8 +164,6 @@ function toggleFavourite(themename) {
   }
   UpdateConfig.saveToLocalStorage();
   refreshButtons();
-  // showFavouriteThemesAtTheTop();
-  CommandlineLists.updateThemeCommands();
 }
 
 export function updateActiveTab() {