diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 2223d0bdf2678f4c4fed1d842d3b3991d7ff6c95..f733dfa82282b8c28a2086206b031cc693a3ddb9 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -9680,6 +9680,9 @@ nautilus_files_view_init (NautilusFilesView *view)
     nautilus_application_set_accelerator (app, "view.copy", "<control>c");
     nautilus_application_set_accelerator (app, "view.create-link-in-place", "<control><shift>m");
     nautilus_application_set_accelerator (app, "view.new-folder", "<control><shift>n");
+    /* These two actions should never be enabled at the same time. */
+    nautilus_application_set_accelerator (app, "view.star", "<shift><control>s");
+    nautilus_application_set_accelerator (app, "view.unstar", "<shift><control>s");
     /* Only accesible by shorcuts */
     nautilus_application_set_accelerator (app, "view.select-pattern", "<control>s");
     nautilus_application_set_accelerators (app, "view.zoom-standard", zoom_standard_accels);
diff --git a/src/resources/gtk/help-overlay.ui b/src/resources/gtk/help-overlay.ui
index 9c58363928a3bb6263e2efe986c7db5ef696aaa2..cfd6277d98137a4a66259036b65b09238aa78b31 100644
--- a/src/resources/gtk/help-overlay.ui
+++ b/src/resources/gtk/help-overlay.ui
@@ -46,6 +46,13 @@
                 <property name="accelerator">&lt;Primary&gt;D</property>
               </object>
             </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
+                <property name="title" translatable="yes" context="shortcut window">Star/Unstar selection</property>
+                <property name="accelerator">&lt;shift&gt;&lt;Primary&gt;S</property>
+              </object>
+            </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>