diff --git a/autoload/gitgutter/hunk.vim b/autoload/gitgutter/hunk.vim
index 1dcb150..28059c0 100644
--- a/autoload/gitgutter/hunk.vim
+++ b/autoload/gitgutter/hunk.vim
@@ -447,8 +447,14 @@ function! s:open_hunk_preview_window()
 
       " Assumes cursor is in original window.
       autocmd CursorMoved <buffer> ++once call gitgutter#hunk#close_hunk_preview_window()
+
       if g:gitgutter_close_preview_on_escape
+        " Map <Esc> to close the floating preview.
         nnoremap <buffer> <silent> <Esc> :<C-U>call gitgutter#hunk#close_hunk_preview_window()<CR>
+        " Ensure that when the preview window is closed, the map is removed.
+        autocmd User GitGutterPreviewClosed silent! nunmap <buffer> <Esc>
+        autocmd CursorMoved <buffer> ++once silent! nunmap <buffer> <Esc>
+        execute "autocmd WinClosed <buffer=".winbufnr(s:winid)."> doautocmd" s:nomodeline "User GitGutterPreviewClosed"
       endif
 
       return