diff --git a/src/floating.c b/src/floating.c
index 2facc6cf..1e7a4fac 100644
--- a/src/floating.c
+++ b/src/floating.c
@@ -42,6 +42,11 @@ void toggle_floating_mode(xcb_connection_t *conn, Client *client, bool automatic
         Container *con = client->container;
         i3Font *font = load_font(conn, config.font);
 
+        if (client->dock) {
+                DLOG("Not putting dock client into floating mode\n");
+                return;
+        }
+
         if (con == NULL) {
                 DLOG("This client is already in floating (container == NULL), re-inserting\n");
                 Client *next_tiling;