diff --git a/dgl/src/pugl/pugl_x11.c b/dgl/src/pugl/pugl_x11.c
index eac570ce..d1f68ea4 100644
--- a/dgl/src/pugl/pugl_x11.c
+++ b/dgl/src/pugl/pugl_x11.c
@@ -203,6 +203,8 @@ puglDestroy(PuglView* view)
 		return;
 	}
 
+	x_fib_close(view->impl->display);
+
 	glXDestroyContext(view->impl->display, view->impl->ctx);
 	XDestroyWindow(view->impl->display, view->impl->win);
 	XCloseDisplay(view->impl->display);
@@ -346,6 +348,10 @@ puglProcessEvents(PuglView* view)
 			break;
 		}
 
+		if (event.xany.window != view->impl->win) {
+			continue;
+		}
+
 		switch (event.type) {
 		case MapNotify:
 			puglReshape(view, view->width, view->height);