diff --git a/rc.lua b/rc.lua
index f169c75..a1a9540 100644
--- a/rc.lua
+++ b/rc.lua
@@ -316,20 +316,10 @@ globalkeys = awful.util.table.join(
 	awful.key({ modkey,           }, 'Right',  awful.tag.viewnext),
 	awful.key({ modkey,           }, 'Escape', awful.tag.history.restore),
 
-	awful.key({ modkey,           }, 'j',
-		function ()
-			awful.client.focus.byidx(1)
-			if client.focus then
-				client.focus:raise()
-			end
-		end),
-	awful.key({ modkey,           }, 'k',
-		function ()
-			awful.client.focus.byidx(-1)
-			if client.focus then
-				client.focus:raise()
-			end
-		end),
+	-- Switch between windows
+	awful.key({ modkey,           }, 'j', function () awful.client.focus.byidx(1) end),
+	awful.key({ modkey,           }, 'k', function () awful.client.focus.byidx(-1) end),
+	awful.key({ modkey,           }, 'i', function () client.focus:raise() end),
 	awful.key({ modkey,           }, 'w', function () mymainmenu:show() end),
 
 	-- Layout manipulation
@@ -338,6 +328,8 @@ globalkeys = awful.util.table.join(
 	awful.key({ modkey, 'Control' }, 'j', function () awful.screen.focus_relative(1) end),
 	awful.key({ modkey, 'Control' }, 'k', function () awful.screen.focus_relative(-1) end),
 	awful.key({ modkey,           }, 'u', awful.client.urgent.jumpto),
+
+	-- Mod#+Tab hotkeys
 	awful.key({ modkey,           }, 'Tab',
 		function ()
 			awful.client.focus.history.previous()