2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 17a3aae11..f58749919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-14  Oliver Kiddle  <opk@zsh.org>
+
+	* 38286: Src/Zle/zle_misc.c: cursor correction following
+	yank-pop is only applicable to vi command mode
+
 	* Christian Neukirchen: 37847: Completion/Unix/Command/_du:
 	update du arguments up to GNU du 8.25
 
diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c
index 25f65b39c..a040ca0df 100644
--- a/Src/Zle/zle_misc.c
+++ b/Src/Zle/zle_misc.c
@@ -597,7 +597,7 @@ static void pastebuf(Cutbuffer buf, int mult, int position)
 	    zlecs += cc;
 	}
 	yanke = zlecs;
-	if (zlecs)
+	if (zlecs && invicmdmode())
 	    DECCS();
     }
 }