diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp
index c14e29161a2..b79d41b5a3e 100644
--- a/base/shell/explorer/trayntfy.cpp
+++ b/base/shell/explorer/trayntfy.cpp
@@ -510,6 +510,8 @@ public:
             parentHWND = ::GetParent(parentHWND);
             ::GetClientRect(parentHWND, &windowRect);
 
+            int VisibleButtonCount = Toolbar.GetVisibleButtonCount();
+
             data = (PSYS_PAGER_COPY_DATA) cpData->lpData;
             iconData = &data->nicon_data;
 
@@ -530,11 +532,10 @@ public:
                 return FALSE;
             }
 
-            SendMessage(parentHWND,
-                WM_SIZE,
-                0,
-                MAKELONG(windowRect.right - windowRect.left,
-                         windowRect.bottom - windowRect.top));
+            if (VisibleButtonCount != Toolbar.GetVisibleButtonCount())
+            {
+                SendMessage(parentHWND, WM_SIZE, 0, 0);
+            }
 
             return ret;
         }