diff --git a/src/backend/x11.c b/src/backend/x11.c
index fdf3931..9ccf19d 100644
--- a/src/backend/x11.c
+++ b/src/backend/x11.c
@@ -931,10 +931,6 @@ static void MwLLMakeBorderlessImpl(MwLL handle, int toggle) {
 	hints.flags	  = MWM_HINTS_DECORATIONS;
 	hints.decorations = toggle ? 0 : 1;
 	XChangeProperty(handle->x11.display, handle->x11.window, atom, atom, 32, PropModeReplace, (unsigned char*)&hints, 5);
-
-	XUnmapWindow(handle->x11.display, handle->x11.window);
-
-	wait_map(handle, 1, 0);
 }
 
 static void MwLLFocusImpl(MwLL handle) {
diff --git a/src/widget/window.c b/src/widget/window.c
index 05cfc8d..fff2ce9 100644
--- a/src/widget/window.c
+++ b/src/widget/window.c
@@ -21,7 +21,9 @@ static void draw(MwWidget handle) {
 	MwLLFreeColor(c);
 }
 static void mwWindowMakeBorderlessImpl(MwWidget handle, int toggle) {
+	MwLLShow(handle->lowlevel, 0);
 	MwLLMakeBorderless(handle->lowlevel, toggle);
+	MwLLShow(handle->lowlevel, 1);
 }
 
 static void func_handler(MwWidget handle, const char* name, void* out, va_list va) {