diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index f58a69d16a..607a4b4ec0 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -870,6 +870,16 @@ void MediaPluginCEF::unicodeInput(std::string event, LLSD native_key_data = LLSD
 	U64 lparam = ll_U32_from_sd(native_key_data["l_param"]);
 	mCEFLib->nativeKeyboardEventWin(msg, wparam, lparam);
 #endif
+// <FS:ND> Keyboard handling for Linux.
+#if LL_LINUX
+	uint32_t native_scan_code = (uint32_t)(native_key_data["sdl_sym"].asInteger());
+	uint32_t native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());
+	uint32_t native_modifiers = (uint32_t)(native_key_data["cef_modifiers"].asInteger());
+	if( native_scan_code == '\n' )
+		native_scan_code = '\r';
+	mCEFLib->nativeKeyboardEvent(dullahan::KE_KEY_DOWN, native_scan_code, native_virtual_key, native_modifiers);
+#endif
+// </FS:ND>
 };
 
 ////////////////////////////////////////////////////////////////////////////////