diff --git a/client.c b/client.c
index b2e81153..c684ee99 100644
--- a/client.c
+++ b/client.c
@@ -199,8 +199,7 @@ client_focus(Client *c, int screen, Bool from_mouse)
                          globalconf.screens[screen].colors_selected[ColBorder].pixel);
         XSetInputFocus(globalconf.display, c->win, RevertToPointerRoot, CurrentTime);
         if(!from_mouse
-           || !globalconf.screens[screen].sloppy_focus
-           || globalconf.screens[screen].sloppy_focus_raise)
+           || (globalconf.screens[screen].sloppy_focus && globalconf.screens[screen].sloppy_focus_raise))
             XRaiseWindow(globalconf.display, c->win);
         /* since we're dropping EnterWindow events and sometimes the window
          * will appear under the mouse, grabbuttons */
diff --git a/layout.c b/layout.c
index ad1578d8..4be1d411 100644
--- a/layout.c
+++ b/layout.c
@@ -38,16 +38,6 @@ extern AwesomeConf globalconf;
 
 #include "layoutgen.h"
 
-static void
-layout_raise_floatings(int screen)
-{
-    Client *c;
-
-    for(c = globalconf.clients; c; c = c->next)
-        if(c->isfloating && client_isvisible(c, screen))
-            XRaiseWindow(globalconf.display, c->win);
-}
-
 /** Arrange windows following current selected layout
  * \param screen the screen to arrange
  */
@@ -80,8 +70,6 @@ arrange(int screen)
                 client_focus(c, screen, False);
         }
 
-    layout_raise_floatings(screen);
-
     /* if we have a valid client that could be focused but currently no window
      * are focused, then set the focus on this window */
     if((c = focus_get_current_client(screen)) && !globalconf.focus->client)