diff --git a/docs/changes.txt b/docs/changes.txt
index 1a50947943..97b68c46f1 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -549,6 +549,7 @@ MSW:
 - Fix sending of wxEVT_COMMAND_LIST_COL_DRAGGING events in wxListCtrl.
 - Allow putting the UAC symbol on buttons (Chris Spencer).
 - Fix wxTaskBarIcon for older Windows systems (Daniel Wyatt).
+- Fixed wxComboCtrl::SetButtonPosition() on Vista/Win7.
 
 i18n:
 
diff --git a/include/wx/combo.h b/include/wx/combo.h
index 0c31d0bb50..3aa8a32c56 100644
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -95,7 +95,8 @@ enum
     // Internal use: Skip popup animation.
     wxCC_IFLAG_DISABLE_POPUP_ANIM   = 0x2000,
     // Internal use: Drop-button is a bitmap button or has non-default size
-    // (but can still be on either side of the control).
+    // (but can still be on either side of the control), regardless whether
+    // specified by the platform or the application.
     wxCC_IFLAG_HAS_NONSTANDARD_BUTTON   = 0x4000
 };
 
diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index f037eb9dbd..c5304c8850 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -2335,6 +2335,9 @@ void wxComboCtrlBase::SetButtonPosition( int width, int height,
     m_btnSide = side;
     m_btnSpacingX = spacingX;
 
+    if ( width > 0 || height > 0 || spacingX )
+        m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+
     RecalcAndRefresh();
 }