diff --git a/README b/README
index fa5ea28d..844e7e7b 100644
--- a/README
+++ b/README
@@ -15,17 +15,17 @@ SUGAR_PROFILE=profile-2 sugar
 ...
 
 
-Key bindings
-============
+Emulator key bindings
+=====================
 
 F1     Mesh zoom level
 F2     Friends zoom level
 F3     Home zoom level
 F4     Activity zoom level
 
-Shift+Alt+F9     Show the frame
-Shift+Alt+F10    Toggle chat visibility
-Shift+Alt+F11    Open a terminal activity
-Shift+Alt+F12    Open the log viewer
+Alt+f  Show the frame
+Alt+o  Toggle overlay visibility
+Alt+=  Open the developer console
+Alt+0  Open the developer console
 
 Ctrl+S Activate sketch mode in chat
diff --git a/shell/view/Shell.py b/shell/view/Shell.py
index d3153c12..8a3136cb 100644
--- a/shell/view/Shell.py
+++ b/shell/view/Shell.py
@@ -105,8 +105,8 @@ class Shell(gobject.GObject):
         self._key_grabber.grab('<alt>Tab')
 
         # For non-OLPC machines
-        self._key_grabber.grab('<shft><alt>F9')
-        self._key_grabber.grab('<shft><alt>F10')
+        self._key_grabber.grab('<alt>f')
+        self._key_grabber.grab('<alt>o')
 
     def _key_pressed_cb(self, grabber, key):
         if key == 'F1':
@@ -139,9 +139,9 @@ class Shell(gobject.GObject):
             self._hw_manager.set_display_mode(HardwareManager.B_AND_W_MODE)
         elif key == '<alt>equal' or key == '<alt>0':
             gobject.idle_add(self._show_console_cb)
-        elif key == '<shft><alt>F9':
+        elif key == '<alt>f':
             self._frame.notify_key_press()
-        elif key == '<shft><alt>F10':
+        elif key == '<alt>o':
             self.toggle_chat_visibility()
         elif key == '0xDC': # Camera key
             self._handle_camera_key()