--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp	Thu Sep 24 12:53:48 2009 +0300
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp	Mon Oct 26 08:28:45 2009 +0200
@@ -384,6 +384,9 @@
                     frame->selectionController()->end() != endPos) {
                     event->setDefaultHandled();
                 }
+                else {
+                    m_shouldEndEditing = !m_webView->fepTextEditor()->IsTextAreaFocused();
+                }
                 break;
 
             case EKeyRightArrow:
@@ -404,6 +407,9 @@
                     frame->selectionController()->end() != endPos) {
                     event->setDefaultHandled();
                 }
+                else {
+                    m_shouldEndEditing = !m_webView->fepTextEditor()->IsTextAreaFocused();
+                }
                 break;
 
             case EKeyUpArrow: