diff --git a/ChangeLog b/ChangeLog
index 03e2b0953..556a137da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-12  Oliver Kiddle <opk@zsh.org>
+
+	* 35834 (tweaked): Src/Zle/zle_misc.c: strip a final newline from
+	pasted text: inserting is hard to tell apart from accepting it
+
 2015-08-12  Mikael Magnusson  <mikachu@gmail.com>
 
 	* 36077: Functions/VCS_Info/Backends/VCS_INFO_get_data_bzr,
diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c
index 502e41e35..6f58af626 100644
--- a/Src/Zle/zle_misc.c
+++ b/Src/Zle/zle_misc.c
@@ -787,6 +787,12 @@ bracketedpaste(char **args)
 	    zmult = 1;
 	    if (region_active)
 		killregion(zlenoargs);
+	    /* chop a final newline if it's insertion would be hard to
+	     * distinguish by the user from the line being accepted */
+	    else if (n > 1 && zlecontext != ZLCON_VARED &&
+		    (zlecs + (insmode ? 0 : n - 1)) >= zlell &&
+		    wpaste[n-1] == ZWC('\n'))
+		n--;
 	    yankcs = yankb = zlecs;
 	    doinsert(wpaste, n);
 	    yanke = zlecs;