diff --git a/src/version.c b/src/version.c
index a6e2f1e..db75af7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3313,
+/**/
     3312,
 /**/
     3311,
diff --git a/src/window.c b/src/window.c
index 7dcb8ed..1cc8549 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1684,24 +1684,10 @@
     curwin->w_vsep_width = wp->w_vsep_width;
     wp->w_vsep_width = temp;
 
-    // If the windows are not in the same frame, exchange the sizes to avoid
-    // messing up the window layout.  Otherwise fix the frame sizes.
-    if (curwin->w_frame->fr_parent != wp->w_frame->fr_parent)
-    {
-	temp = curwin->w_height;
-	curwin->w_height = wp->w_height;
-	wp->w_height = temp;
-	temp = curwin->w_width;
-	curwin->w_width = wp->w_width;
-	wp->w_width = temp;
-    }
-    else
-    {
-	frame_fix_height(curwin);
-	frame_fix_height(wp);
-	frame_fix_width(curwin);
-	frame_fix_width(wp);
-    }
+    frame_fix_height(curwin);
+    frame_fix_height(wp);
+    frame_fix_width(curwin);
+    frame_fix_width(wp);
 
     (void)win_comp_pos();		// recompute window positions
 
@@ -5275,12 +5261,7 @@
     if (frp->fr_prev != NULL)
 	frp->fr_prev->fr_next = frp->fr_next;
     else
-    {
 	frp->fr_parent->fr_child = frp->fr_next;
-	// special case: topframe->fr_child == frp
-	if (topframe->fr_child == frp)
-	    topframe->fr_child = frp->fr_next;
-    }
     if (frp->fr_next != NULL)
 	frp->fr_next->fr_prev = frp->fr_prev;
 }