diff --git a/frontends/src/primitivus/primitivus b/frontends/src/primitivus/primitivus
index ae8ca546..39191924 100755
--- a/frontends/src/primitivus/primitivus
+++ b/frontends/src/primitivus/primitivus
@@ -140,6 +140,8 @@ class EditBar(sat_widgets.ModalEdit):
             self.set_edit_pos(len(text))
 
         if key == "esc":
+            # first save the text to the current mode, then change to NORMAL
+            self.app._updateInputHistory(self.get_edit_text(), mode=self.mode)
             self.app._updateInputHistory(mode='NORMAL')
         if self._mode == 'NORMAL' and key in self._modes:
             self.app._updateInputHistory(mode=self._modes[key][0])