diff --git a/messages.c b/messages.c
index 99daff2..c330f4a 100644
--- a/messages.c
+++ b/messages.c
@@ -75,7 +75,6 @@ void process_message(char *msg, char *rsp)
     } else if (strcmp(cmd, "toggle_fullscreen") == 0) {
         if (desk->focus != NULL)
             toggle_fullscreen(desk->focus->client);
-        return;
     } else if (strcmp(cmd, "toggle_floating") == 0) {
         split_mode = MODE_AUTOMATIC;
         toggle_floating(desk->focus);
diff --git a/window.c b/window.c
index d3e54b8..6224d24 100644
--- a/window.c
+++ b/window.c
@@ -182,13 +182,6 @@ void toggle_fullscreen(client_t *c)
         c->fullscreen = false;
         xcb_atom_t values[] = {XCB_NONE};
         xcb_ewmh_set_wm_state(ewmh, c->window, LENGTH(values), values);
-        xcb_rectangle_t rect;
-        if (is_floating(c))
-            rect = c->floating_rectangle;
-        else
-            rect = c->tiled_rectangle;
-        window_border_width(c->window, c->border_width);
-        window_move_resize(c->window, rect.x, rect.y, rect.width, rect.height);
     } else {
         c->fullscreen = true;
         xcb_atom_t values[] = {ewmh->_NET_WM_STATE_FULLSCREEN};
@@ -214,7 +207,6 @@ void toggle_floating(node_t *n)
         window_raise(c->window);
     else if (is_tiled(c))
         window_lower(c->window);
-
 }
 
 void toggle_locked(client_t *c)