diff --git a/Mac/NewMessageWindow.m b/Mac/NewMessageWindow.m
index 7bafa64..e814a8d 100644
--- a/Mac/NewMessageWindow.m
+++ b/Mac/NewMessageWindow.m
@@ -270,7 +270,7 @@
 
         retval = YES; // causes Apple to NOT fire the default enter action
     }
-    else if (commandSelector == @selector(noop:) || isEnter) {
+    else if (commandSelector == @selector(noop:) && isEnter) {
         retval = YES;
         [self sendPost:control];
     }