diff --git a/data/gui/roster_window.ui b/data/gui/roster_window.ui
index 3a4ced776..a0fd915e2 100644
--- a/data/gui/roster_window.ui
+++ b/data/gui/roster_window.ui
@@ -12,9 +12,9 @@
     <accel-groups>
       <group name="accelgroup1"/>
     </accel-groups>
-    <signal name="focus_in_event" handler="on_roster_window_focus_in_event"/>
     <signal name="key_press_event" handler="on_roster_window_key_press_event"/>
     <signal name="delete_event" handler="on_roster_window_delete_event"/>
+    <signal name="focus_in_event" handler="on_roster_window_focus_in_event"/>
     <signal name="focus_out_event" handler="on_roster_window_focus_out_event"/>
     <signal name="popup_menu" handler="on_roster_window_popup_menu"/>
     <child>
@@ -282,6 +282,16 @@
                         <signal name="activate" handler="on_faq_menuitem_activate"/>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="keyboard_shortcuts_menuitem">
+                        <property name="label" translatable="yes">Keyboard Shortcuts</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="image">image14</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="on_keyboard_shortcuts_menuitem_activate"/>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="menuitem1">
                         <property name="visible">True</property>
@@ -467,4 +477,9 @@
     <property name="stock">gtk-disconnect</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkImage" id="image14">
+    <property name="visible">True</property>
+    <property name="stock">gtk-info</property>
+    <property name="icon-size">1</property>
+  </object>
 </interface>
diff --git a/src/roster_window.py b/src/roster_window.py
index ca0aec7c1..d882ba3fc 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -3978,6 +3978,10 @@ class RosterWindow:
         helpers.launch_browser_mailer('url',
             'http://trac.gajim.org/wiki/GajimFaq')
 
+    def on_keyboard_shortcuts_menuitem_activate(self, widget):
+        helpers.launch_browser_mailer('url',
+            'http://trac.gajim.org/wiki/KeyboardShortcuts')
+
     def on_features_menuitem_activate(self, widget):
         features_window.FeaturesWindow()