diff --git a/lib/quake.lua b/lib/quake.lua
index 9274922..102d728 100644
--- a/lib/quake.lua
+++ b/lib/quake.lua
@@ -21,6 +21,11 @@
 --    awful.key({ modkey }, "`",
 -- 	     function () quakeconsole[mouse.screen]:toggle() end)
 
+-- If you have a rule like "awful.client.setslave" for your terminals,
+-- ensure you use an exception for
+-- QuakeConsoleNeedsUniqueName. Otherwise, you may run into problems
+-- with focus.
+
 local setmetatable = setmetatable
 local string = string
 local awful  = require("awful")
@@ -94,6 +99,7 @@ function QuakeConsole:display()
    client.above = true
    client.skip_taskbar = true
    client.sticky = true
+   client.
 
    -- Toggle display
    if self.visible then
diff --git a/rc/rules.lua b/rc/rules.lua
index b26474e..67ec339 100644
--- a/rc/rules.lua
+++ b/rc/rules.lua
@@ -30,5 +30,7 @@ awful.rules.rules = {
 		    "Transmission-gtk",
 		    "Keepassx",
 		  } },
-     properties = { }, callback = awful.client.setslave },
+     except = { icon_name = "QuakeConsoleNeedsUniqueName" },
+     properties = { },
+     callback = awful.client.setslave },
 }