diff --git a/src/draw.h b/src/draw.h
index 0ccb37c..bdd21dd 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -87,10 +87,10 @@ draw_reversed_rect(Drawable dr, struct client *c, bool t)
      else
      {
           XDrawRectangle(W->dpy, dr, W->rgc,
-                         ug->x + g->x + i + W->padding >> 2,
-                         ug->y + g->y + i + W->padding >> 2,
-                         g->w - (i << 1) - W->padding >> 1,
-                         g->h - (i << 1) - W->padding >> 1);
+                         ug->x + g->x + i + (W->padding >> 2),
+                         ug->y + g->y + i + (W->padding >> 2),
+                         g->w - (i << 1) - (W->padding >> 1),
+                         g->h - (i << 1) - (W->padding >> 1));
      }
 }
 
diff --git a/src/wmfs.c b/src/wmfs.c
index ea25fc7..78a249f 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -250,6 +250,9 @@ wmfs_scan(void)
                          continue;
                     }
 
+                    if(ewmh_manage_window_type_desktop(w[i]))
+                         continue;
+
                     if(XGetWindowProperty(W->dpy, w[i], ATOM("_WMFS_TAG"), 0, 32,
                                           False, XA_CARDINAL, &rt, &rf, &ir, &il,
                                           (unsigned char**)&ret)