diff --git a/Makefile b/Makefile
index d09ff61..26dc4ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 all: cmake
 
 release:
-	mkdir build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -H./ -B./build -G Ninja
+	mkdir -p build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -H./ -B./build -G Ninja
 	cmake --build ./build --config Release --target all -j 10
 
 debug:
-	mkdir build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -H./ -B./build -G Ninja
+	mkdir -p build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -H./ -B./build -G Ninja
 	cmake --build ./build --config Debug --target all -j 10
 
 clear:
diff --git a/src/windowManager.cpp b/src/windowManager.cpp
index 0fc54c1..df24510 100644
--- a/src/windowManager.cpp
+++ b/src/windowManager.cpp
@@ -765,7 +765,7 @@ void CWindowManager::applyShapeToWindow(CWindow* pWindow) {
     if (!pWindow)
         return;
 
-    const auto ROUNDING = pWindow->getFullscreen() ? 0 : ConfigManager::getInt("rounding");
+    const auto ROUNDING = pWindow->getFullscreen() || (ConfigManager::getInt("layout:no_gaps_when_only") && getWindowsOnWorkspace(pWindow->getWorkspaceID()) == 1) ? 0 : ConfigManager::getInt("rounding");
 
     const auto SHAPEQUERY = xcb_get_extension_data(DisplayConnection, &xcb_shape_id);