diff --git a/reactos/base/shell/explorer/trayntfy.cpp b/reactos/base/shell/explorer/trayntfy.cpp
index 76d5ccb186a..adc5ae05361 100644
--- a/reactos/base/shell/explorer/trayntfy.cpp
+++ b/reactos/base/shell/explorer/trayntfy.cpp
@@ -132,7 +132,6 @@ public:
                 tbBtn.fsState |= TBSTATE_HIDDEN;
                 m_VisibleButtonCount--;
             }
-
         }
 
         /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */
@@ -209,6 +208,12 @@ public:
             return;
 
         DeleteButton(index);
+
+        if (!(notifyItem->dwState & NIS_HIDDEN))
+        {
+            m_VisibleButtonCount--;
+        }
+
         delete notifyItem;
     }