diff --git a/libs/libinterface/EnterTextView.cpp b/libs/libinterface/EnterTextView.cpp
index 75792bd..9c5a863 100644
--- a/libs/libinterface/EnterTextView.cpp
+++ b/libs/libinterface/EnterTextView.cpp
@@ -33,8 +33,11 @@ EnterTextView::KeyDown(const char* bytes, int32 numBytes)
 	if (fTarget != NULL && (bytes[0] == B_ENTER) && (modifiers == 0))
 	{
 		BMessage* msg = new BMessage(fMessage);
-		if (fTextSlot.IsEmpty() == false)
+		if (fTextSlot.IsEmpty() == false) {
 			msg->AddString(fTextSlot.String(), Text());
+			SetText("");
+			ScrollToOffset(0);
+		}
 		fTarget->MessageReceived(msg);
 	}
 	else