diff --git a/src/apps/icon-o-matic/generic/gui/InputTextView.cpp b/src/apps/icon-o-matic/generic/gui/InputTextView.cpp
index d1901d06e8..74ee0736eb 100644
--- a/src/apps/icon-o-matic/generic/gui/InputTextView.cpp
+++ b/src/apps/icon-o-matic/generic/gui/InputTextView.cpp
@@ -65,9 +65,11 @@ InputTextView::KeyDown(const char* bytes, int32 numBytes)
 			case B_ESCAPE:
 				// revert any typing changes
 				RevertChanges();
+				fTextBeforeFocus = Text();
 				break;
 			case B_RETURN:
 				ApplyChanges();
+				fTextBeforeFocus = Text();
 				break;
 			default:
 				handled = false;