diff --git a/src/main/frontend/components/select.cljs b/src/main/frontend/components/select.cljs
index aa56f0616b..82eb8a3b19 100644
--- a/src/main/frontend/components/select.cljs
+++ b/src/main/frontend/components/select.cljs
@@ -2,7 +2,7 @@
   "Generic component for fuzzy searching items to select an item. See
   select-config to add a new use or select-type for this component. To use the
   new select-type, set :ui/open-select to the select-type. See
-  :select-graph/open command for an example."
+  :graph/open command for an example."
   (:require [frontend.modules.shortcut.core :as shortcut]
             [frontend.context.i18n :as i18n]
             [frontend.search :as search]
@@ -13,6 +13,7 @@
             [frontend.text :as text]
             [rum.core :as rum]
             [frontend.config :as config]
+            [frontend.handler.repo :as repo-handler]
             [reitit.frontend.easy :as rfe]))
 
 (rum/defc render-item
@@ -32,7 +33,8 @@
                    state)}
   [state {:keys [items limit on-chosen empty-placeholder prompt-key]
           :or {limit 100
-               prompt-key :select/default-prompt}}]
+               prompt-key :select/default-prompt
+               empty-placeholder (fn [_t] [:div])}}]
   (rum/with-context [[t] i18n/*tongue-context*]
     (let [input (::input state)]
       [:div.cp__select.cp__select-main
@@ -62,11 +64,12 @@
     fuzzy search and selection. Items can have an optional :id and are displayed
     lightly for a given item.
   * :on-chosen - fn that is given item when it is chosen.
-  * :empty-placeholder - fn that returns hiccup html to render if no matched graphs found.
-  * :prompt-key - dictionary keyword that prompts when components is first open.
-    Defaults to :select/default-prompt."
+  * :empty-placeholder (optional) - fn that returns hiccup html to render if no
+    matched graphs found.
+  * :prompt-key (optional) - dictionary keyword that prompts when components is
+    first open. Defaults to :select/default-prompt."
   []
-  {:select-graph
+  {:graph-open
    {:items-fn (fn []
                 (->>
                  (state/get-repos)
@@ -90,7 +93,23 @@
                           (ui/button
                            (t :select.graph/add-graph)
                            :href (rfe/href :repo-add)
-                           :on-click state/close-modal!)])}})
+                           :on-click state/close-modal!)])}
+   :graph-remove
+   {:items-fn (fn []
+                (->> (state/get-repos)
+                     (remove (fn [{:keys [url]}]
+                               (config/demo-graph? url)))
+                     (map (fn [{:keys [url] :as original-graph}]
+                            {:value (text/get-graph-name-from-path
+                                     ;; TODO: Use helper when a common one is refactored
+                                     ;; from components.repo
+                                     (if (config/local-db? url)
+                                       (config/get-local-dir url)
+                                       (db/get-repo-path url)))
+                             :id (config/get-repo-dir url)
+                             :graph url
+                             :original-graph original-graph}))))
+    :on-chosen #(repo-handler/remove-repo! (:original-graph %))}})
 
 (rum/defc select-modal < rum/reactive
   []
diff --git a/src/main/frontend/modules/shortcut/config.cljs b/src/main/frontend/modules/shortcut/config.cljs
index 42c6623743..68b2f92a08 100644
--- a/src/main/frontend/modules/shortcut/config.cljs
+++ b/src/main/frontend/modules/shortcut/config.cljs
@@ -314,10 +314,18 @@
                                     :binding "mod+shift+p"
                                     :fn      (fn [] (state/toggle! :ui/command-palette-open?))}
 
-   :select-graph/open              {:desc    "Open select graph component"
-                                    :fn      (fn [] (state/set-state! :ui/open-select :select-graph))
+   :graph/open              {:desc    "Select graph to open"
+                                    :fn      (fn [] (state/set-state! :ui/open-select :graph-open))
                                     :binding "mod+shift+g"}
 
+   :graph/remove            {:desc    "Remove a graph"
+                                    :fn      (fn [] (state/set-state! :ui/open-select :graph-remove))
+                                    :binding false}
+
+   :graph/add                      {:desc "Add a graph"
+                                    :fn (fn [] (route-handler/redirect! {:to :repo-add}))
+                                    :binding false}
+
    :command/run                    (when (util/electron?)
                                      {:desc    "Run git command"
                                       :binding "mod+shift+1"
@@ -498,7 +506,9 @@
     :shortcut.handler/editor-global
     (->
      (build-category-map [:command-palette/toggle
-                          :select-graph/open
+                          :graph/open
+                          :graph/remove
+                          :graph/add
                           :editor/cycle-todo
                           :editor/up
                           :editor/down
@@ -680,7 +690,9 @@
     :pdf/next-page
     :command/run
     :command-palette/toggle
-    :select-graph/open
+    :graph/open
+    :graph/remove
+    :graph/add
     :sidebar/clear
     :sidebar/open-today-page
     :search/re-index