diff --git a/shell/Shell.py b/shell/Shell.py
index 7b47026a..848971b2 100755
--- a/shell/Shell.py
+++ b/shell/Shell.py
@@ -57,6 +57,7 @@ class Shell(gobject.GObject):
 		self._key_grabber.grab('F3')
 		self._key_grabber.grab('F4')
 		self._key_grabber.grab('F5')
+		self._key_grabber.grab('F6')
 
 		self._home_window = HomeWindow(self)
 		self._home_window.show()
@@ -95,6 +96,8 @@ class Shell(gobject.GObject):
 			self.set_zoom_level(sugar.ZOOM_MESH)
 		elif key == 'F5':
 			self._frame.toggle_visibility()
+		elif key == 'F6':
+			ActivityFactory.create('org.sugar.Terminal')
 
 	def set_console(self, console):
 		self._console = console
diff --git a/shell/data/kbdconfig b/shell/data/kbdconfig
index 9d9a449f..415c69ff 100644
--- a/shell/data/kbdconfig
+++ b/shell/data/kbdconfig
@@ -5,4 +5,3 @@
 <Alt>n=next
 <Alt>p=prev
 <Alt>c=close
-f6=!sugar-activity org.sugar.Terminal