diff --git a/scim-wnn/src/romkan.cpp b/scim-wnn/src/romkan.cpp
index 57b6e37..4a3297d 100644
--- a/scim-wnn/src/romkan.cpp
+++ b/scim-wnn/src/romkan.cpp
@@ -315,6 +315,10 @@
 {
     if (key.get_ascii_code() && (!key.is_alt_down()) && (!key.is_control_down())) {
         if (key.get_ascii_code() == ' ') return(false);
+        // ��ľ���֤��٤����
+        if ((key.code == SCIM_KEY_Return) ||
+            (key.code == SCIM_KEY_Linefeed) ||
+            (key.code == SCIM_KEY_Tab)) return(false);
         insert(key.get_ascii_code());
         return(true);
     }
diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp
index f677132..72891e6 100644
--- a/scim-wnn/src/scim_wnn_imengine.cpp
+++ b/scim-wnn/src/scim_wnn_imengine.cpp
@@ -431,7 +431,13 @@
     if (m_preeditor->inputEvent(key)) {
         updatePreEditor();
         return(true);
+    } else {
+        // preeditor�ǽ����Ǥ��ʤ��ä����Ϥ�Ϥ�commit���ƥ��ץꥱ���������֤��٤�����
+        if (m_preeditor->getTextLength()) commit_string(m_preeditor->getText(true));
+        m_preeditor->reset();
+        updatePreEditor();
     }
+
     return(false);
 }