diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 3cdf222..945cb09 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3345,6 +3345,12 @@
 		send_tabline_event(x < 50 ? -1 : 0);
 	    }
 	}
+	else if (bevent->button == 2)
+	{
+	    if (clicked_page != 0)
+		// Middle mouse click on tabpage label closes that tab.
+		send_tabline_menu_event(clicked_page, TABLINE_MENU_CLOSE);
+	}
     }
 
     // We didn't handle the event.
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 203b8fa..3ade631 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -8094,6 +8094,20 @@
 		}
 		break;
 	    }
+	case WM_MBUTTONUP:
+	    {
+		TCHITTESTINFO htinfo;
+
+		htinfo.pt.x = GET_X_LPARAM(lParam);
+		htinfo.pt.y = GET_Y_LPARAM(lParam);
+		idx0 = TabCtrl_HitTest(hwnd, &htinfo);
+		if (idx0 != -1)
+		{
+		    idx0 += 1;
+		    send_tabline_menu_event(idx0, TABLINE_MENU_CLOSE);
+		}
+		break;
+	    }
 	default:
 	    break;
     }
diff --git a/src/version.c b/src/version.c
index 3111b4f..d6535b3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    597,
+/**/
     596,
 /**/
     595,