diff --git a/src/input_handler.cc b/src/input_handler.cc
index 17e72874f..9d81f711e 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -1582,7 +1582,7 @@ void InputHandler::repeat_last_insert()
         // refill last_insert,  this is very inefficient, but necessary at the moment
         // to properly handle insert completion
         m_last_insert.keys.push_back(key);
-        current_mode().handle_key(key, true);
+        handle_key(key);
     }
     kak_assert(dynamic_cast<InputModes::Normal*>(&current_mode()) != nullptr);
 }
@@ -1655,11 +1655,12 @@ void InputHandler::handle_key(Key key)
     auto dec = on_scope_end([this]{ --m_handle_key_level;} );
 
     auto process_key = [&](Key key, bool synthesized) {
-        if (m_last_insert.recording)
-            m_last_insert.keys.push_back(key);
         current_mode().handle_key(key, synthesized);
     };
 
+    if (m_last_insert.recording and m_handle_key_level <= 1)
+        m_last_insert.keys.push_back(key);
+
     const auto keymap_mode = current_mode().keymap_mode();
     KeymapManager& keymaps = m_context.keymaps();
     if (keymaps.is_mapped(key, keymap_mode) and not m_context.keymaps_disabled())
diff --git a/test/normal/repeat-insert/repeat-insert-hooks/cmd b/test/normal/repeat-insert/repeat-insert-hooks/cmd
new file mode 100644
index 000000000..a72627ced
--- /dev/null
+++ b/test/normal/repeat-insert/repeat-insert-hooks/cmd
@@ -0,0 +1 @@
+:hook -group h g InsertChar f %{exec FINSERTED}<ret>ifoo<esc>.\.\ifoo<esc>.
diff --git a/test/normal/repeat-insert/repeat-insert-hooks/out b/test/normal/repeat-insert/repeat-insert-hooks/out
new file mode 100644
index 000000000..7f03fc896
--- /dev/null
+++ b/test/normal/repeat-insert/repeat-insert-hooks/out
@@ -0,0 +1 @@
+fFINSERTEDoofFINSERTEDoofoofoofoo
diff --git a/test/normal/repeat-insert/repeat-insert-mapped/cmd b/test/normal/repeat-insert/repeat-insert-mapped/cmd
new file mode 100644
index 000000000..d29da7565
--- /dev/null
+++ b/test/normal/repeat-insert/repeat-insert-mapped/cmd
@@ -0,0 +1 @@
+ixyz<esc>.
diff --git a/test/normal/repeat-insert/repeat-insert-mapped/out b/test/normal/repeat-insert/repeat-insert-mapped/out
new file mode 100644
index 000000000..377189766
--- /dev/null
+++ b/test/normal/repeat-insert/repeat-insert-mapped/out
@@ -0,0 +1 @@
+zzxx
diff --git a/test/normal/repeat-insert/repeat-insert-mapped/rc b/test/normal/repeat-insert/repeat-insert-mapped/rc
new file mode 100644
index 000000000..6c1d2d048
--- /dev/null
+++ b/test/normal/repeat-insert/repeat-insert-mapped/rc
@@ -0,0 +1 @@
+map global insert y '<a-;>gh'
diff --git a/test/normal/repeat-insert/cmd b/test/normal/repeat-insert/repeat-insert/cmd
similarity index 100%
rename from test/normal/repeat-insert/cmd
rename to test/normal/repeat-insert/repeat-insert/cmd
diff --git a/test/normal/repeat-insert/out b/test/normal/repeat-insert/repeat-insert/out
similarity index 100%
rename from test/normal/repeat-insert/out
rename to test/normal/repeat-insert/repeat-insert/out
diff --git a/test/normal/repeat-insert/repeat-normal-exec/cmd b/test/normal/repeat-insert/repeat-normal-exec/cmd
new file mode 100644
index 000000000..d077660b2
--- /dev/null
+++ b/test/normal/repeat-insert/repeat-normal-exec/cmd
@@ -0,0 +1 @@
+i<a-;>:execute-keys foo<ret><esc>.
diff --git a/test/normal/repeat-insert/repeat-normal-exec/out b/test/normal/repeat-insert/repeat-normal-exec/out
new file mode 100644
index 000000000..55b5f1fcd
--- /dev/null
+++ b/test/normal/repeat-insert/repeat-normal-exec/out
@@ -0,0 +1 @@
+foofoo
diff --git a/test/normal/repeat-insert/repeat-normal-movement/cmd b/test/normal/repeat-insert/repeat-normal-movement/cmd
new file mode 100644
index 000000000..5a536286d
--- /dev/null
+++ b/test/normal/repeat-insert/repeat-normal-movement/cmd
@@ -0,0 +1 @@
+ifoo<a-;>ghbar<esc>.
diff --git a/test/normal/repeat-insert/repeat-normal-movement/out b/test/normal/repeat-insert/repeat-normal-movement/out
new file mode 100644
index 000000000..8faa240e7
--- /dev/null
+++ b/test/normal/repeat-insert/repeat-normal-movement/out
@@ -0,0 +1 @@
+barbarfoofoo