3 files changed, 18 insertions, 0 deletions
diff --git a/dwm.h b/dwm.h
index c13179fe..a1bd1e48 100644
--- a/dwm.h
+++ b/dwm.h
@@ -108,6 +108,7 @@ extern unsigned int textw(const char *text);
 
 /* event.c */
 extern void grabkeys();
+extern void ungrabkeys();
 
 /* main.c */
 extern int getproto(Window w);
diff --git a/event.c b/event.c
index e5ca1664..4357eaee 100644
--- a/event.c
+++ b/event.c
@@ -370,3 +370,19 @@ grabkeys()
 				GrabModeAsync, GrabModeAsync);
 	}
 }
+
+void
+ungrabkeys()
+{
+	static unsigned int len = sizeof(key) / sizeof(key[0]);
+	unsigned int i;
+	KeyCode code;
+
+	for(i = 0; i < len; i++) {
+		code = XKeysymToKeycode(dpy, key[i].keysym);
+		XUngrabKey(dpy, code, key[i].mod, root);
+		XUngrabKey(dpy, code, key[i].mod | LockMask, root);
+		XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
+		XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);
+	}
+}
diff --git a/main.c b/main.c
index 16ebbaef..228228bf 100644
--- a/main.c
+++ b/main.c
@@ -22,6 +22,7 @@ static Bool otherwm;
 static void
 cleanup()
 {
+	ungrabkeys();
 	while(sel) {
 		resize(sel, True, TopLeft);
 		unmanage(sel);