diff --git a/KeyBindings/DefaultKeyBindings.dict b/KeyBindings/DefaultKeyBindings.dict
index 4fc75d656..4795687d4 100644
--- a/KeyBindings/DefaultKeyBindings.dict
+++ b/KeyBindings/DefaultKeyBindings.dict
@@ -18,8 +18,8 @@
   "Control-Shift-UpArrow" = "moveToBeginningOfDocumentAndModifySelection:";
   "Control-Shift-DownArrow" = "moveToEndOfDocumentAndModifySelection:";
 
-  "Alternate-UpArrow" = ("moveUp:", "moveWordBackward:"); 
-  "Alternate-DownArrow" = ("moveDown:", "moveWordForward:"); 
+  "Alternate-UpArrow" = ("moveBackward:", "moveToBeginningOfParagraph:");
+  "Alternate-DownArrow" = ("moveForward:", "moveToEndOfParagraph:");
   "Alternate-LeftArrow" = "moveWordBackward:";
   "Alternate-RightArrow" = "moveWordForward:";
 
diff --git a/Source/NSInputManager.m b/Source/NSInputManager.m
index 63aa3b372..a4267800b 100644
--- a/Source/NSInputManager.m
+++ b/Source/NSInputManager.m
@@ -675,7 +675,14 @@ static NSInputManager *currentInputManager = nil;
         case NSEnterCharacter:
         case NSFormFeedCharacter:
         case NSCarriageReturnCharacter:
-          [self doCommandBySelector: @selector (insertNewline:)];
+          if (flags & NSAlternateKeyMask)
+            {
+              [self doCommandBySelector: @selector (insertNewlineIgnoringFieldEditor:)];
+            }
+          else
+            {
+              [self doCommandBySelector: @selector (insertNewline:)];
+            }
           break;
           
         case NSHelpFunctionKey: