diff --git a/player/command.c b/player/command.c
index d703c39afe..6e8679d1ad 100644
--- a/player/command.c
+++ b/player/command.c
@@ -2330,6 +2330,9 @@ static int mp_property_current_window_scale(void *ctx, struct m_property *prop,
     if (vid_w < 1 || vid_h < 1)
         return M_PROPERTY_UNAVAILABLE;
 
+    if (params.rotate % 180 == 90 && (vo->driver->caps & VO_CAP_ROTATE90))
+        MPSWAP(int, vid_w, vid_h);
+
     if (action == M_PROPERTY_SET) {
         // Also called by update_window_scale as a NULL property.
         double scale = *(double *)arg;