diff --git a/plugins/color_scheme_dev.py b/plugins/color_scheme_dev.py
index b0a45cef..2acbfa03 100644
--- a/plugins/color_scheme_dev.py
+++ b/plugins/color_scheme_dev.py
@@ -256,16 +256,28 @@ def run(self):
                 (setting, self.get_scheme_path(view, setting))
                 for setting in ('dark_color_scheme', 'light_color_scheme')
             ]
+            current_os_mode = sublime.ui_info()['system']['style']
             choices = [
                 sublime.QuickPanelItem(setting, details=str(path), kind=KIND_SCHEME)
                 for setting, path in paths
             ]
 
+            selected_index = -1
+            for idx, choice in enumerate(choices):
+                if choice.trigger.startswith(current_os_mode):
+                    choice.annotation = 'Active'
+                    selected_index = idx
+
             def on_done(i):
                 if i >= 0:
                     self.open_scheme(paths[i][1])
 
-            self.window.show_quick_panel(choices, on_done)
+            self.window.show_quick_panel(
+                choices,
+                on_done,
+                selected_index=selected_index,
+                placeholder='Choose a color scheme to edit ...'
+            )
 
     @staticmethod
     def get_scheme_path(view, setting_name):
diff --git a/plugins/theme_dev.py b/plugins/theme_dev.py
index d20ca67d..a8fe311e 100644
--- a/plugins/theme_dev.py
+++ b/plugins/theme_dev.py
@@ -51,11 +51,23 @@ def run(self):
                 for setting in ('dark_theme', 'light_theme')
             ]
 
+            current_os_mode = sublime.ui_info()['system']['style']
+            selected_index = -1
+            for idx, choice in enumerate(choices):
+                if choice.trigger.startswith(current_os_mode):
+                    choice.annotation = 'Active'
+                    selected_index = idx
+
             def on_done(i):
                 if i >= 0:
                     self.open_theme(choices[i].details)
 
-            self.window.show_quick_panel(choices, on_done)
+            self.window.show_quick_panel(
+                choices,
+                on_done,
+                selected_index=selected_index,
+                placeholder="Choose a theme to edit ..."
+            )
 
     def open_theme(self, theme_name):
         theme_path = ResourcePath(sublime.find_resources(theme_name)[0])