1 files changed, 12 insertions, 6 deletions

diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index a6c015aebf..0b51bc42c0 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -1226,13 +1226,19 @@ static void kbd_move_cursor(struct edit_state *state, int dir)
     {
         state->changed = CHANGED_CURSOR;
     }
-    else
+    else if (state->editpos > state->len_utf8)
     {
-        state->editpos -= dir;
-#if CONFIG_CODEC == SWCODEC
-        if (global_settings.talk_menu)
-            beep_play(1000, 150, 1500);
-#endif
+        state->editpos = 0;
+        #if CONFIG_CODEC == SWCODEC
+        if (global_settings.talk_menu) beep_play(1000, 150, 1500);
+        #endif
+    }
+    else if (state->editpos < 0)
+    {
+        state->editpos = state->len_utf8;
+        #if CONFIG_CODEC == SWCODEC
+        if (global_settings.talk_menu) beep_play(1000, 150, 1500);
+        #endif
     }
 }