diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index e1ec962adf..f400d4aea8 100644
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -126,7 +126,7 @@ protected:
 
     // event handlers
     void OnIdle(wxIdleEvent& event);
-    
+
     // forces update of thumb's visual appearence (does nothing if m_dirty=FALSE)
     void UpdateThumb();
 
@@ -136,6 +136,9 @@ protected:
     // common part of all ctors
     void Init();
 
+    // is this scrollbar attached to a window or a standalone control?
+    bool IsStandalone() const;
+
 private:
     // total range of the scrollbar in logical units
     int m_range;
diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 66d0d7a173..16fc367cdf 100644
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -165,22 +165,26 @@ wxScrollBar::~wxScrollBar()
 {
 }
 
+// ----------------------------------------------------------------------------
+// misc accessors
+// ----------------------------------------------------------------------------
+
+bool wxScrollBar::IsStandalone() const
+{
+    wxWindow *parent = GetParent();
+    if ( !parent )
+    {
+        return TRUE;
+    }
+
+    return (parent->GetScrollbar(wxHORIZONTAL) != this) &&
+           (parent->GetScrollbar(wxVERTICAL) != this);
+}
+
 bool wxScrollBar::AcceptsFocus() const
 {
-    if (!wxWindow::AcceptsFocus()) return FALSE;
-    
-    wxWindow *parent = (wxWindow*) GetParent();
-    
-    if (parent)
-    {
-        if ((parent->GetScrollbar( wxHORIZONTAL ) == this) ||
-            (parent->GetScrollbar( wxVERTICAL ) == this))
-        {
-            return FALSE;
-        }
-    }
-    
-    return TRUE;
+    // the window scrollbars never accept focus
+    return wxScrollBarBase::AcceptsFocus() && IsStandalone();
 }
 
 // ----------------------------------------------------------------------------
@@ -543,6 +547,16 @@ bool wxScrollBar::PerformAction(const wxControlAction& action,
     bool changed = m_thumbPos != thumbOld;
     if ( notify || changed )
     {
+        if ( IsStandalone() )
+        {
+            // we should generate EVT_SCROLL events for the standalone
+            // scrollbars and not the EVT_SCROLLWIN ones
+            //
+            // NB: we assume that scrollbar events are sequentially numbered
+            //     but this should be ok as other code relies on this as well
+            scrollType += wxEVT_SCROLL_TOP - wxEVT_SCROLLWIN_TOP;
+        }
+
         wxScrollWinEvent event(scrollType, m_thumbPos,
                                IsVertical() ? wxVERTICAL : wxHORIZONTAL);
         event.SetEventObject(this);