diff --git a/contents/code/tilingmanager.js b/contents/code/tilingmanager.js
index 21a189628714240afbb2872b0609e5c6647c7d94..b86aae8954cf5926e9648ac42435a411c26431c4 100644
--- a/contents/code/tilingmanager.js
+++ b/contents/code/tilingmanager.js
@@ -171,6 +171,17 @@ function TilingManager() {
 							 self.tiles.addClient(client);
 						 }
 					 });
+    registerShortcut("Toggle Border",
+                     "Toggle Border",
+                     "Meta+U",
+                     function() {
+						 var client = workspace.activeClient;
+						 if (client == null) {
+							 print("No active client");
+							 return;
+						 }
+						 client.noBorder = ! client.noBorder;
+					 });
     registerShortcut("Switch Focus Left",
                      "Switch Focus Left",
                      "Meta+H",