diff --git a/src/layout.c b/src/layout.c
index 05783ea..350b821 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -499,6 +499,15 @@ uicb_togglefree(uicb_t cmd)
      sel->tile = False;
      sel->max  = False;
      sel->lmax = False;
+     if(sel->free)
+     {
+          sel->geo.x = sel->ogeo.x;
+          sel->geo.y = sel->ogeo.y;
+          sel->geo.width = sel->ogeo.width;
+          sel->geo.height = sel->ogeo.height;
+          client_moveresize(sel, sel->geo, True);
+     }
+
      client_raise(sel);
 
      arrange();
diff --git a/src/structs.h b/src/structs.h
index 7e8e57a..2031b7a 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -129,19 +129,6 @@ typedef struct
      char statustext[1024];
 } InfoBar;
 
-/* Surface \o/ */
-typedef struct
-{
-     char *text;
-     Drawable dr;
-     Window win;
-     XRectangle geo;
-     MouseBinding mousebind[10];
-     int nmouse;
-     char *fg;
-     uint bg;
-} Surface;
-
 /* Layout Structure */
 typedef struct
 {