diff --git a/NEWS b/NEWS
index 5826e01..66d5bed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,10 @@
 1.6.0: January ??, 2009
  * Switching between notebooks and loading notebooks is now much faster.
- * New keyboard shortcuts for switching to next open note and previous open
-   note: Page down and page up.
+ * Several new keyboard shortcuts:
+   * Switch to the next open note: Page down
+   * Switch to the previous open note: Page up
+   * Start a search: Ctrl-slash
+   * Save the current note: Ctrl-space
  * Fixed various bugs related to the subscription page.
 
 1.5.12: December 30, 2008
diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index 2ccf617..969611d 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -1069,8 +1069,14 @@ Wiki.prototype.key_pressed = function ( event ) {
   var code = event.key().code;
   if ( event.modifier().ctrl ) {
     // ctrl-m: make a new note
-    if ( code == 77 )
+    if ( code == 77 ) {
       this.create_blank_editor( event );
+    // ctrl-slash: start a search
+    } else if ( code == 191 ) {
+      var search_text = getElement( "search_text" );
+      if ( search_text )
+        search_text.focus();
+    }
   }
 }
 
@@ -1121,6 +1127,14 @@ Wiki.prototype.editor_key_pressed = function ( editor, event ) {
     // ctrl-d: delete note
     } else if ( code == 68 ) {
       this.delete_editor( event );
+    // ctrl-slash: start a search
+    } else if ( code == 191 ) {
+      var search_text = getElement( "search_text" );
+      if ( search_text )
+        search_text.focus();
+    // ctrl-space: save the current editor
+    } else if ( code == 32 ) {
+      this.save_editor();
     }
   // shift-tab: outdent
   } else if ( event.modifier().shift && code == 9 ) {