diff --git a/src/renderer/settings/control-panel-settings-component.ts b/src/renderer/settings/control-panel-settings-component.ts
index a95522680..1a3208677 100644
--- a/src/renderer/settings/control-panel-settings-component.ts
+++ b/src/renderer/settings/control-panel-settings-component.ts
@@ -1,17 +1,18 @@
 import Vue from "vue";
 import { vueEventDispatcher } from "../vue-event-dispatcher";
 import { VueEventChannels } from "../vue-event-channels";
-import { PluginSettings } from "./plugin-settings";
 import { UserConfigOptions } from "../../common/config/user-config-options";
 import { TranslationSet } from "../../common/translation/translation-set";
 import { UserConfirmationDialogParams, UserConfirmationDialogType } from "./modals/user-confirmation-dialog-params";
 import { deepCopy } from "../../common/helpers/object-helpers";
 import { defaultControlPanelOptions } from "../../common/config/control-panel-options";
+import { SettingOsSpecific } from "./settings-os-specific";
+import { platform } from "os";
 
 export const controlPanelSettingsComponent = Vue.extend({
     data() {
         return {
-            settingName: PluginSettings.ControlPanel,
+            settingName: SettingOsSpecific.ControlPanel.replace(`${platform()}:`, ""),
             visible: false,
         };
     },
diff --git a/src/renderer/settings/plugin-settings.ts b/src/renderer/settings/plugin-settings.ts
index 3514badb0..5b85b40be 100644
--- a/src/renderer/settings/plugin-settings.ts
+++ b/src/renderer/settings/plugin-settings.ts
@@ -16,5 +16,4 @@ export enum PluginSettings {
     ColorConverter = "Color Converter",
     BrowserBookmarks = "Browser Bookmarks",
     Dictionary = "Dictionary",
-    ControlPanel = "Control Panel",
 }
diff --git a/src/renderer/settings/setting-menu-item-component.ts b/src/renderer/settings/setting-menu-item-component.ts
index 949a5ac93..17fafb5a7 100644
--- a/src/renderer/settings/setting-menu-item-component.ts
+++ b/src/renderer/settings/setting-menu-item-component.ts
@@ -38,8 +38,6 @@ export const settingMenuItemComponent = Vue.extend({
                     return translations.currencyConverter;
                 case PluginSettings.Commandline:
                     return translations.commandline;
-                case PluginSettings.ControlPanel:
-                    return translations.controlPanel;
                 case PluginSettings.Dictionary:
                     return translations.dictionary;
                 case PluginSettings.Email:
@@ -60,6 +58,8 @@ export const settingMenuItemComponent = Vue.extend({
                     return translations.url;
                 case PluginSettings.WebSearch:
                     return translations.websearch;
+                case SettingOsSpecific.ControlPanel:
+                    return translations.controlPanel;
                 case SettingOsSpecific.Everything:
                     return translations.everythingSearch;
                 case SettingOsSpecific.MdFind:
@@ -97,8 +97,6 @@ export const settingMenuItemComponent = Vue.extend({
                     return config.colorConverterOptions.isEnabled;
                 case PluginSettings.Commandline:
                     return config.commandlineOptions.isEnabled;
-                case PluginSettings.ControlPanel:
-                    return config.controlPanelOptions.isEnabled;
                 case PluginSettings.CurrencyConverter:
                     return config.currencyConverterOptions.isEnabled;
                 case PluginSettings.Dictionary:
@@ -123,6 +121,8 @@ export const settingMenuItemComponent = Vue.extend({
                     return config.websearchOptions.isEnabled;
                 case PluginSettings.Workflow:
                     return config.workflowOptions.isEnabled;
+                case SettingOsSpecific.ControlPanel.replace(`${platform()}:`, ""):
+                    return config.controlPanelOptions.isEnabled;
                 case SettingOsSpecific.Everything.replace(`${platform()}:`, ""):
                     return config.everythingSearchOptions.enabled;
                 case SettingOsSpecific.MdFind.replace(`${platform()}:`, ""):
diff --git a/src/renderer/settings/settings-os-specific.ts b/src/renderer/settings/settings-os-specific.ts
index 2c1804657..1a257c3f8 100644
--- a/src/renderer/settings/settings-os-specific.ts
+++ b/src/renderer/settings/settings-os-specific.ts
@@ -2,4 +2,5 @@ export enum SettingOsSpecific {
     MdFind = "darwin:Mdfind",
     Everything = "win32:Everything",
     Uwp = "win32:UWP",
+    ControlPanel = "win32:Control Panel",
 }