diff --git a/src/osd/modules/debugger/osx/debugosxdebugwindowhandler.m b/src/osd/modules/debugger/osx/debugosxdebugwindowhandler.m
index e8585179b96..9be854432aa 100644
--- a/src/osd/modules/debugger/osx/debugosxdebugwindowhandler.m
+++ b/src/osd/modules/debugger/osx/debugosxdebugwindowhandler.m
@@ -359,7 +359,9 @@ NSString *const MAMEAuxiliaryDebugWindowWillCloseNotification = @"MAMEAuxiliaryD
 
 - (BOOL)control:(NSControl *)control textShouldBeginEditing:(NSText *)fieldEditor
 {
-	[history edit];
+	if (control == expressionField)
+		[history edit];
+
 	return YES;
 }