diff --git a/src/map.c b/src/map.c
index d99a84fc39..f3ff00729b 100644
--- a/src/map.c
+++ b/src/map.c
@@ -725,6 +725,9 @@ do_map(
 				    mpp = &(mp->m_next);
 				    continue;
 				}
+				if (did_simplify && keyround == 1
+							  && !mp->m_simplified)
+				    break;
 				// We reset the indicated mode bits. If nothing
 				// is left the entry is deleted below.
 				mp->m_mode &= ~mode;
@@ -814,7 +817,10 @@ do_map(
 	{
 	    // delete entry
 	    if (!did_it)
-		retval = 2;	// no match
+	    {
+		if (!did_simplify || keyround == 2)
+		    retval = 2;		// no match
+	    }
 	    else if (*keys == Ctrl_C)
 	    {
 		// If CTRL-C has been unmapped, reuse it for Interrupting.
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 7fdbdf6184..e0008d62a2 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -1627,4 +1627,15 @@ func Test_mouse_drag_insert_map()
   set mouse&
 endfunc
 
+func Test_unmap_simplfied()
+  map <C-I> foo
+  map <Tab> bar
+  call assert_equal('foo', maparg('<C-I>'))
+  call assert_equal('bar', maparg('<Tab>'))
+  unmap <C-I>
+  call assert_equal('', maparg('<C-I>'))
+  call assert_equal('bar', maparg('<Tab>'))
+  unmap <Tab>
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 74b4625eb0..1d54137bf9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4819,
 /**/
     4818,
 /**/