diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index b544d93..03067e2 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -11,7 +11,7 @@ oni = { }                      -- Container for custom functions.
 
 oni.maildirfmt = "/home/slash/documents/mail/%s/inbox/new/"
 
--- {{{ Error handling
+--- Error handling
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
 if awesome.startup_errors then
@@ -34,8 +34,8 @@ do
         in_error = false
     end)
 end
--- }}}
 
+--- Functions
 function oni.focus_raise(direction)
    awful.client.focus.bydirection(direction)
    if client.focus then client.focus:raise() end
@@ -118,6 +118,7 @@ function oni.run_or_raise(cmd, properties)
       -- And then focus the client
       client.focus = c
       c:raise()
+      awful.screen.focus(c.screen)
       return
    end
    awful.util.spawn(cmd)