diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 5ea0db4c5..04c9a95ed 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -103,7 +103,6 @@ arp_end (void)
 		event.what = qe_none;
 		return self;
 	}
-	[objects handleEvent: event];
 	if (event.what == qe_key
 		&& (event.key.code == '\x18' || event.key.code == '\x11')) {
 		event.what = qe_command;
@@ -114,6 +113,7 @@ arp_end (void)
 			|| event.message.command == qc_error)) {
 		endState = event.message.command;
 	}
+	[objects handleEvent: event];
 	return self;
 }
 @end
diff --git a/ruamoko/qwaq/qwaq-editor.r b/ruamoko/qwaq/qwaq-editor.r
index 32e468021..9d36e27ac 100644
--- a/ruamoko/qwaq/qwaq-editor.r
+++ b/ruamoko/qwaq/qwaq-editor.r
@@ -1,3 +1,4 @@
+#include <QF/keys.h>
 #include "color.h"
 #include "qwaq-editor.h"
 
@@ -54,7 +55,17 @@
 				[self scrollRight: 1];
 			}
 		}
+	} else if (event.what == qe_keydown) {
+		switch (event.key.code) {
+			case QFK_PAGEUP:
+				[self scrollUp: ylen];
+				break;
+			case QFK_PAGEDOWN:
+				[self scrollDown: ylen];
+				break;
+		}
 	}
+	event.what = qe_none;
 	return self;
 }