diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 9df5bf3e1..7d5ed4ba2 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -40,7 +40,7 @@ arp_end (void)
 	initialize ();
 	init_pair (1, COLOR_WHITE, COLOR_BLUE);
 	init_pair (2, COLOR_WHITE, COLOR_BLACK);
-	init_pair (3, COLOR_WHITE, COLOR_GREEN);
+	init_pair (3, COLOR_BLACK, COLOR_GREEN);
 	init_pair (4, COLOR_YELLOW, COLOR_RED);
 
 	screen = [TextContext screen];
diff --git a/ruamoko/qwaq/qwaq-button.r b/ruamoko/qwaq/qwaq-button.r
index cece78609..6287de9ce 100644
--- a/ruamoko/qwaq/qwaq-button.r
+++ b/ruamoko/qwaq/qwaq-button.r
@@ -38,13 +38,15 @@
 		switch ((qwaq_mouse_event) (event.what & qe_mouse)) {
 			case qe_mousedown:
 				pressed = 1;
-				[self redraw];
 				action = onPress;
+				[self grabMouse];
+				[self redraw];
 				break;
 			case qe_mouseup:
 				pressed = 0;
-				[self redraw];
 				action = onRelease;
+				[self releaseMouse];
+				[self redraw];
 				break;
 			case qe_mouseclick:
 				action = onClick;
diff --git a/ruamoko/qwaq/qwaq-group.r b/ruamoko/qwaq/qwaq-group.r
index 48eca7bd6..c8af9bf8a 100644
--- a/ruamoko/qwaq/qwaq-group.r
+++ b/ruamoko/qwaq/qwaq-group.r
@@ -27,6 +27,7 @@
 -insert: (View *) view
 {
 	[views addObject: view];
+	[view setOwner: self];
 	[view setContext: context];
 	return self;
 }
@@ -135,8 +136,8 @@ find_mouse_view(Group *group, Point pos)
 
 -(void) releaseMouse
 {
-	mouse_grabbed = mouse_within;
-	[owner grabMouse];
+	mouse_grabbed = nil;
+	[owner releaseMouse];
 }
 
 @end