diff --git a/linux_4ed.cpp b/linux_4ed.cpp
index 25fdfd21..99e0d2b7 100644
--- a/linux_4ed.cpp
+++ b/linux_4ed.cpp
@@ -2643,6 +2643,8 @@ LinuxX11WindowInit(int argc, char** argv, int* WinWidth, int* WinHeight)
     };
 
     XSetWMProtocols(linuxvars.XDisplay, linuxvars.XWindow, wm_protos, 2);
+
+    return true;
 }
 
 internal void
@@ -3471,6 +3473,11 @@ main(int argc, char **argv)
         }
     }
 
+    if(linuxvars.XDisplay){
+        if(linuxvars.XWindow) XDestroyWindow(linuxvars.XDisplay, linuxvars.XWindow);
+        XCloseDisplay(linuxvars.XDisplay);
+    }
+
     return 0;
 }