diff --git a/book/src/keymap.md b/book/src/keymap.md
index 901c84711c72d..1da59cccf6e60 100644
--- a/book/src/keymap.md
+++ b/book/src/keymap.md
@@ -162,6 +162,7 @@ active language server for the file to work.
 | `a`   | Go to the last accessed/alternate file           | `goto_last_accessed_file`  |
 | `n`   | Go to next buffer                                | `goto_next_buffer`         |
 | `p`   | Go to previous buffer                            | `goto_previous_buffer`     |
+| `.`   | Go to last modification in current file          | `goto_last_modification`   |
 
 #### Match mode
 
diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
index b53c01fe759df..644c45e34da5d 100644
--- a/helix-core/src/history.rs
+++ b/helix-core/src/history.rs
@@ -133,6 +133,32 @@ impl History {
         Some(&self.revisions[last_child.get()].transaction)
     }
 
+    // Get the position of last change
+    pub fn last_edit_pos(&self) -> Option<usize> {
+        if self.current == 0 {
+            return None;
+        }
+        let current_revision = &self.revisions[self.current];
+        let primary_selection = current_revision
+            .inversion
+            .selection()
+            .expect("inversion always contains a selection")
+            .primary();
+        let (_from, to, _fragment) = current_revision
+            .transaction
+            .changes_iter()
+            // find a change that matches the primary selection
+            .find(|range| crate::Range::new(range.0, range.1).overlaps(&primary_selection))
+            // or use the first change
+            .or(current_revision.transaction.changes_iter().next())
+            .unwrap();
+        let pos = current_revision
+            .transaction
+            .changes()
+            .map_pos(to, crate::Assoc::After);
+        Some(pos)
+    }
+
     fn lowest_common_ancestor(&self, mut a: usize, mut b: usize) -> usize {
         use std::collections::HashSet;
         let mut a_path_set = HashSet::new();
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 738621b0466f8..2c6636dfb523a 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -259,6 +259,7 @@ impl Command {
         goto_window_middle, "Goto window middle",
         goto_window_bottom, "Goto window bottom",
         goto_last_accessed_file, "Goto last accessed file",
+        goto_last_modification, "Goto last modification",
         goto_line, "Goto line",
         goto_last_line, "Goto last line",
         goto_first_diag, "Goto first diagnostic",
@@ -3196,6 +3197,19 @@ fn goto_last_accessed_file(cx: &mut Context) {
     }
 }
 
+fn goto_last_modification(cx: &mut Context) {
+    let (view, doc) = current!(cx.editor);
+    let pos = doc.history.get_mut().last_edit_pos();
+    let text = doc.text().slice(..);
+    if let Some(pos) = pos {
+        let selection = doc
+            .selection(view.id)
+            .clone()
+            .transform(|range| range.put_cursor(text, pos, doc.mode == Mode::Select));
+        doc.set_selection(view.id, selection);
+    }
+}
+
 fn select_mode(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     let text = doc.text().slice(..);
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index b2b865e434c57..547f3817412cd 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -509,6 +509,7 @@ impl Default for Keymaps {
                 "a" => goto_last_accessed_file,
                 "n" => goto_next_buffer,
                 "p" => goto_previous_buffer,
+                "." => goto_last_modification,
             },
             ":" => command_mode,
 
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 90f09e9c9db15..5f53ca58e5f4a 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -741,7 +741,7 @@ impl EditorView {
                     std::num::NonZeroUsize::new(cxt.editor.count.map_or(i, |c| c.get() * 10 + i));
             }
             // special handling for repeat operator
-            key!('.') => {
+            key!('.') if self.keymaps.pending().is_empty() => {
                 // first execute whatever put us into insert mode
                 self.last_insert.0.execute(cxt);
                 // then replay the inputs
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 80f6a740f81aa..ca9e4b16661a0 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -96,7 +96,7 @@ pub struct Document {
     // It can be used as a cell where we will take it out to get some parts of the history and put
     // it back as it separated from the edits. We could split out the parts manually but that will
     // be more troublesome.
-    history: Cell<History>,
+    pub history: Cell<History>,
 
     pub savepoint: Option<Transaction>,