diff --git a/errors.lua b/errors.lua
index 268b601..2fc8a1d 100644
--- a/errors.lua
+++ b/errors.lua
@@ -1,5 +1,5 @@
 -- Notification library
-local naughty = naughty
+local naughty = require("naughty")
 
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
diff --git a/rules.lua b/rules.lua
index cc07f98..6b730b9 100644
--- a/rules.lua
+++ b/rules.lua
@@ -76,9 +76,7 @@ local function setup(self)
 		},
 		{
 			rule = { role = "buddy_list" },
-			properties = {
-				master = true
-			}
+			callback = awful.client.setmaster
 		},
 		{
 			rule = { class = "Steam", name = "Friends" },
diff --git a/signals.lua b/signals.lua
index 8c599de..87ec7f4 100644
--- a/signals.lua
+++ b/signals.lua
@@ -5,7 +5,13 @@ client.connect_signal("manage", function (c, startup)
     -- Enable sloppy focus
     c:connect_signal("mouse::enter", function(c)
         if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
-            and awful.client.focus.filter(c) then
+            and awful.client.focus.filter(c)
+            and not(
+                client.focus ~= nil
+                and client.focus.class == "jetbrains-idea"
+                and c.class == "jetbrains-idea"
+                and client.focus.type == "dialog"
+            ) then
             client.focus = c
         end
     end)
@@ -13,7 +19,7 @@ client.connect_signal("manage", function (c, startup)
     if not startup then
         -- Set the windows at the slave,
         -- i.e. put it at the end of others instead of setting it master.
-        -- awful.client.setslave(c)
+        awful.client.setslave(c)
 
         -- Put windows in a smart way, only if they does not set an initial position.
         if not c.size_hints.user_position and not c.size_hints.program_position then