diff --git a/dom/events/KeyNameList.h b/dom/events/KeyNameList.h
index 6cc5c76bdab..1a6ad1c70a4 100644
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -49,6 +49,13 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Shift)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Symbol)
 // DEFINE_KEYNAME_WITH_SAME_NAME(SymbolLock)
 
+/******************************************************************************
+ * Whitespace Keys
+ *****************************************************************************/
+DEFINE_KEYNAME_WITH_SAME_NAME(Enter)
+// DEFINE_KEYNAME_WITH_SAME_NAME(Separator)
+DEFINE_KEYNAME_WITH_SAME_NAME(Tab)
+
 DEFINE_KEYNAME_WITH_SAME_NAME(Attn)
 DEFINE_KEYNAME_WITH_SAME_NAME(Apps)
 DEFINE_KEYNAME_WITH_SAME_NAME(Crsel)
@@ -115,7 +122,6 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Soft3)
 DEFINE_KEYNAME_WITH_SAME_NAME(Soft4)
 DEFINE_KEYNAME_WITH_SAME_NAME(Accept)
 DEFINE_KEYNAME_WITH_SAME_NAME(Again)
-DEFINE_KEYNAME_WITH_SAME_NAME(Enter)
 DEFINE_KEYNAME_WITH_SAME_NAME(Find)
 DEFINE_KEYNAME_WITH_SAME_NAME(Help)
 DEFINE_KEYNAME_WITH_SAME_NAME(Info)
@@ -153,7 +159,6 @@ DEFINE_KEYNAME_WITH_SAME_NAME(DownRight)
 DEFINE_KEYNAME_WITH_SAME_NAME(Home)
 DEFINE_KEYNAME_WITH_SAME_NAME(End)
 DEFINE_KEYNAME_WITH_SAME_NAME(Select)
-DEFINE_KEYNAME_WITH_SAME_NAME(Tab)
 DEFINE_KEYNAME_WITH_SAME_NAME(Backspace)
 DEFINE_KEYNAME_WITH_SAME_NAME(Clear)
 DEFINE_KEYNAME_WITH_SAME_NAME(Copy)
diff --git a/widget/shared/NativeKeyToDOMKeyName.h b/widget/shared/NativeKeyToDOMKeyName.h
index 127d35cedbf..2a8db1f6ac8 100644
--- a/widget/shared/NativeKeyToDOMKeyName.h
+++ b/widget/shared/NativeKeyToDOMKeyName.h
@@ -170,6 +170,31 @@ KEY_MAP_QT      (Shift, Qt::Key_Shift)
 KEY_MAP_ANDROID (Shift, AKEYCODE_SHIFT_LEFT)
 KEY_MAP_ANDROID (Shift, AKEYCODE_SHIFT_RIGHT)
 
+/******************************************************************************
+ * Whitespace Keys
+ ******************************************************************************/
+// Enter
+KEY_MAP_WIN     (Enter, VK_RETURN)
+KEY_MAP_COCOA   (Enter, kVK_Return)
+KEY_MAP_COCOA   (Enter, kVK_ANSI_KeypadEnter)
+KEY_MAP_COCOA   (Enter, kVK_Powerbook_KeypadEnter)
+KEY_MAP_GTK     (Enter, GDK_Return)
+KEY_MAP_GTK     (Enter, GDK_KP_Enter)
+KEY_MAP_GTK     (Enter, GDK_ISO_Enter)
+KEY_MAP_GTK     (Enter, GDK_3270_Enter)
+KEY_MAP_QT      (Enter, Qt::Key_Return)
+KEY_MAP_QT      (Enter, Qt::Key_Enter)
+KEY_MAP_ANDROID (Enter, AKEYCODE_ENTER)
+KEY_MAP_ANDROID (Enter, AKEYCODE_NUMPAD_ENTER)
+
+// Tab
+KEY_MAP_WIN     (Tab, VK_TAB)
+KEY_MAP_COCOA   (Tab, kVK_Tab)
+KEY_MAP_GTK     (Tab, GDK_Tab)
+KEY_MAP_GTK     (Tab, GDK_KP_Tab)
+KEY_MAP_QT      (Tab, Qt::Key_Tab)
+KEY_MAP_ANDROID (Tab, AKEYCODE_TAB)
+
 
 // Attn
 KEY_MAP_WIN_OTH (Attn, VK_ATTN) // not valid with Japanese keyboard layout
@@ -482,20 +507,6 @@ KEY_MAP_ANDROID (Accept, AKEYCODE_DPAD_CENTER)
 
 // Again
 
-// Enter
-KEY_MAP_WIN     (Enter, VK_RETURN)
-KEY_MAP_COCOA   (Enter, kVK_Return)
-KEY_MAP_COCOA   (Enter, kVK_ANSI_KeypadEnter)
-KEY_MAP_COCOA   (Enter, kVK_Powerbook_KeypadEnter)
-KEY_MAP_GTK     (Enter, GDK_Return)
-KEY_MAP_GTK     (Enter, GDK_KP_Enter)
-KEY_MAP_GTK     (Enter, GDK_ISO_Enter)
-KEY_MAP_GTK     (Enter, GDK_3270_Enter)
-KEY_MAP_QT      (Enter, Qt::Key_Return)
-KEY_MAP_QT      (Enter, Qt::Key_Enter)
-KEY_MAP_ANDROID (Enter, AKEYCODE_ENTER)
-KEY_MAP_ANDROID (Enter, AKEYCODE_NUMPAD_ENTER)
-
 // Find
 KEY_MAP_GTK     (Find, GDK_Find)
 
@@ -700,14 +711,6 @@ KEY_MAP_ANDROID (End, AKEYCODE_MOVE_END)
 KEY_MAP_WIN     (Select, VK_SELECT)
 KEY_MAP_GTK     (Select, GDK_Select)
 
-// Tab
-KEY_MAP_WIN     (Tab, VK_TAB)
-KEY_MAP_COCOA   (Tab, kVK_Tab)
-KEY_MAP_GTK     (Tab, GDK_Tab)
-KEY_MAP_GTK     (Tab, GDK_KP_Tab)
-KEY_MAP_QT      (Tab, Qt::Key_Tab)
-KEY_MAP_ANDROID (Tab, AKEYCODE_TAB)
-
 // Backspace
 KEY_MAP_WIN     (Backspace, VK_BACK)
 KEY_MAP_COCOA   (Backspace, kVK_PC_Backspace)