diff --git a/contents/code/tilelist.js b/contents/code/tilelist.js
index c27a730f539a989a0becf8c74f06f351dca975ab..35dee9027ee98e30737f174df013afec137c2f45 100644
--- a/contents/code/tilelist.js
+++ b/contents/code/tilelist.js
@@ -62,6 +62,10 @@ TileList.prototype.addClient = function(client) {
 		client.tileIndex = - 1;
         return;
     }
+	var noBorder = readConfig("noBorder", false);
+	if (noBorder == true) {
+		client.noBorder = true;
+	}
     var self = this;
     client.tabGroupChanged.connect(function() {
         self._onClientTabGroupChanged(client);
@@ -125,7 +129,6 @@ TileList.prototype.addClient = function(client) {
 			this.tiles[tileIndex].clients.push(client);
 		}
     } else {
-		print("Adding client",client.resourceClass.toString(), "to a new tile");
         // If not, create a new tile
         this._addTile(client);
     }
@@ -186,6 +189,9 @@ TileList.prototype._onClientRemoved = function(client) {
         tile.clients.splice(tile.clients.indexOf(client), 1);
     }
 	client.tiling_tileIndex = - 1;
+	if (client.tiling_floating == true) {
+		client.noBorder = false;
+	}
 };
 
 TileList.prototype._onClientTabGroupChanged = function(client) {
diff --git a/contents/code/tilingmanager.js b/contents/code/tilingmanager.js
index dbdad1b0ab6cef37392a6dc0e7b165e2bc72dfa7..b7d288c72b4a2569bfb8a9d0c163936998434827 100644
--- a/contents/code/tilingmanager.js
+++ b/contents/code/tilingmanager.js
@@ -118,6 +118,7 @@ function TilingManager() {
     var existingClients = workspace.clientList();
     existingClients.forEach(function(client) {
 		self.tiles._onClientRemoved(client);
+		self.tiles.addClient(client);
 		// Don't reset floating so we don't lose the value over restarts
         //client.tiling_floating = null;
     });
diff --git a/contents/config/main.xml b/contents/config/main.xml
index 12a8f8a4a12f3db35f04e147f481d689ec0a2062..4c0d710be3798a0e610f6ee036b217216ec95e2a 100644
--- a/contents/config/main.xml
+++ b/contents/config/main.xml
@@ -9,5 +9,9 @@
 		  <label>The windows (by class) that should float</label>
 		  <default>yakuake,Plasma,Plasma-desktop,krunner,plugin-container</default>
         </entry>
+		<entry name="noBorder" type="bool">
+		  <label>Should borders be removed? FocusUnderMouse recommended</label>
+		  <default>false</default>
+		</entry>
     </group>
 </kcfg>
diff --git a/contents/ui/config.ui b/contents/ui/config.ui
index b685b09f32dd588b70d8df9ccb219005efbf7217..342768bdc242837d830a1991da48711e19b253d9 100644
--- a/contents/ui/config.ui
+++ b/contents/ui/config.ui
@@ -31,6 +31,13 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="kcfg_noBorder">
+     <property name="text">
+      <string>No Borders</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>