diff --git a/src/General/html/Features/Gallery.html b/src/General/html/Features/Gallery.html
index 4ae6f4e80..8e1a265dc 100644
--- a/src/General/html/Features/Gallery.html
+++ b/src/General/html/Features/Gallery.html
@@ -1,7 +1,7 @@
 <div class="gal-viewport">
   <span class="gal-buttons">
-    <a href="javascript:;" class="gal-start" title="Start slideshow"><i></i></a>
-    <a href="javascript:;" class="gal-stop" title="Stop slideshow"><i></i></a>
+    <a href="javascript:;" class="gal-start" title="Start slideshow (S to toggle)"><i></i></a>
+    <a href="javascript:;" class="gal-stop" title="Stop slideshow (S to toggle)"><i></i></a>
     <a href="javascript:;" class="menu-button"><i></i></a>
     <a href="javascript:;" class="gal-close">×</a>
   </span>
diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee
index c692f9733..10909fc6a 100644
--- a/src/Images/Gallery.coffee
+++ b/src/Images/Gallery.coffee
@@ -125,6 +125,10 @@ Gallery =
           Gallery.cb.advanceKey
         when 'Left', ''
           Gallery.cb.prev
+        when 'p'
+          Gallery.cb.pause
+        when 's'
+          Gallery.cb.toggleSlideshow
 
       return unless cb
       e.stopPropagation()
@@ -203,6 +207,7 @@ Gallery =
     toggle:    -> (if Gallery.nodes then Gallery.cb.close else Gallery.build)()
     blank: (e) -> Gallery.cb.close() if e.target is @
     advance:   -> Gallery.cb.advanceKey() unless Gallery.nodes.current.controls
+    toggleSlideshow: ->  Gallery.cb[if Gallery.slideshow then 'stop' else 'start']()
 
     advanceKey: ->
       if Gallery.nodes.current.paused   then return Gallery.nodes.current.play()