diff --git a/src/normal.c b/src/normal.c
index 2d5f8a5..412700a 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4661,8 +4661,8 @@
 		    }
 		    // found start/end of other method: go to match
 		    else if ((pos = findmatchlimit(cap->oap, findc,
-				    (cap->cmdchar == '[') ? FM_BACKWARD : FM_FORWARD,
-				    0)) == NULL)
+			      (cap->cmdchar == '[') ? FM_BACKWARD : FM_FORWARD,
+								   0)) == NULL)
 			n = 0;
 		    else
 			curwin->w_cursor = *pos;
@@ -7505,6 +7505,8 @@
     int		was_visual = FALSE;
     int		dir;
     int		flags = 0;
+    int		save_unnamed = FALSE;
+    yankreg_T	*old_y_current, *old_y_previous;
 
     if (cap->oap->op_type != OP_NOP)
     {
@@ -7551,6 +7553,7 @@
 	    // overwrites if the old contents is being put.
 	    was_visual = TRUE;
 	    regname = cap->oap->regname;
+	    save_unnamed = cap->cmdchar == 'P';
 #ifdef FEAT_CLIPBOARD
 	    adjust_clip_reg(&regname);
 #endif
@@ -7568,6 +7571,11 @@
 	    }
 
 	    // Now delete the selected text. Avoid messages here.
+	    if (save_unnamed)
+	    {
+		old_y_current = get_y_current();
+		old_y_previous = get_y_previous();
+	    }
 	    cap->cmdchar = 'd';
 	    cap->nchar = NUL;
 	    cap->oap->regname = NUL;
@@ -7577,6 +7585,12 @@
 	    empty = (curbuf->b_ml.ml_flags & ML_EMPTY);
 	    --msg_silent;
 
+	    if (save_unnamed)
+	    {
+		set_y_current(old_y_current);
+		set_y_previous(old_y_previous);
+	    }
+
 	    // delete PUT_LINE_BACKWARD;
 	    cap->oap->regname = regname;