diff --git a/Asuro.iso b/Asuro.iso
index fad1c91d..af0ea898 100644
Binary files a/Asuro.iso and b/Asuro.iso differ
diff --git a/bin/kernel.bin b/bin/kernel.bin
index 9db5c511..ee3c1a34 100755
Binary files a/bin/kernel.bin and b/bin/kernel.bin differ
diff --git a/iso/boot/asuro.bin b/iso/boot/asuro.bin
index 9db5c511..ee3c1a34 100755
Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ
diff --git a/lib/asuro.ppu b/lib/asuro.ppu
index 9e433b7b..80911f4a 100644
Binary files a/lib/asuro.ppu and b/lib/asuro.ppu differ
diff --git a/lib/console.o b/lib/console.o
index 7ef7d00b..7aa70af6 100644
Binary files a/lib/console.o and b/lib/console.o differ
diff --git a/lib/console.ppu b/lib/console.ppu
index f5e6c81d..05f744a9 100644
Binary files a/lib/console.ppu and b/lib/console.ppu differ
diff --git a/lib/libpconsole.a b/lib/libpconsole.a
index 6be13aab..48fbc963 100644
Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ
diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a
index b39a8066..ae432236 100644
Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ
diff --git a/lib/libpsystem.a b/lib/libpsystem.a
index 58ba1d90..234f7e89 100644
Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ
diff --git a/src/console.pas b/src/console.pas
index ddff69ff..57ca8cb3 100644
--- a/src/console.pas
+++ b/src/console.pas
@@ -760,15 +760,15 @@ begin
     if UnhandledClick then begin
         if UnhandledClickLeft then begin
             
-            SelectedWindow:= WindowTitleMask[MouseYToTile(WindowManager.MousePrev.Y)][MouseXToTile(WindowManager.MousePrev.X)];
+            SelectedWindow:= ExitMask[MouseYToTile(WindowManager.MousePrev.Y)][MouseXToTile(WindowManager.MousePrev.X)];
             if SelectedWindow <> 0 then begin
-                if WindowManager.Windows[SelectedWindow] <> nil then begin
-                    if WindowManager.Windows[SelectedWindow]^.ShellWND then FocusZOrder(SelectedWindow);
-                end;
+                closeWindow(SelectedWindow);
             end else begin
-                SelectedWindow:= ExitMask[MouseYToTile(WindowManager.MousePrev.Y)][MouseXToTile(WindowManager.MousePrev.X)];
+                SelectedWindow:= WindowTitleMask[MouseYToTile(WindowManager.MousePrev.Y)][MouseXToTile(WindowManager.MousePrev.X)];
                 if SelectedWindow <> 0 then begin
-                    closeWindow(SelectedWindow);
+                    if WindowManager.Windows[SelectedWindow] <> nil then begin
+                        if WindowManager.Windows[SelectedWindow]^.ShellWND then FocusZOrder(SelectedWindow);
+                    end;
                 end else begin
                     SelectedWindow:= WindowMask[MouseYToTile(WindowManager.MousePrev.Y)][MouseXToTile(WindowManager.MousePrev.X)];
                     if (SelectedWindow <> 0) and (WindowManager.Windows[SelectedWindow] <> nil) then begin