diff --git a/contents/code/tilingmanager.js b/contents/code/tilingmanager.js
index f842b8eed5876feb109d29ba02eb57137c8fd5ce..88921e9f49c0db4d44a2e4747bb308aeb340b824 100644
--- a/contents/code/tilingmanager.js
+++ b/contents/code/tilingmanager.js
@@ -234,6 +234,21 @@ function TilingManager() {
 						 var currentDesktop = workspace.currentDesktop - 1;
 						 self.layouts[currentDesktop][currentScreen].toggleActive();
 					 });
+	registerUserActionsMenu(function(client) {
+		return {
+			text : "Toggle floating",
+			triggered: function () {
+				client.tiling_floating = ! client.tiling_floating;
+				if (client.tiling_floating == true) {
+					self.tiles._onClientRemoved(client);
+				} else {
+					self.tiles.addClient(client);
+					client.keepBelow = true;
+				}
+				self.tiles.retile();
+			}
+		};
+	});
 }
 
 /**