diff --git a/docs/changes.txt b/docs/changes.txt
index 4b701423c5..46b34a48ad 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -80,6 +80,7 @@ wxMSW:
 - fixed enhanced metafiles loading from files (Andreas Goebel)
 - wxRadioButtons no longer have to be consecutive in a group
 - fixed spurious selection of combobox text during resize
+- pass correct tool id (and not always -1) to EVT_TOOL_RCLICKED() handler
 
 wxWinCE:
 - Added support for MS Handheld PC 2000. This was done before 2.5.4,
diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index d1079d550c..28f96b3f93 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -1211,11 +1211,14 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
         return;
     }
 
-    if (event.RightDown())
+    if ( event.RightDown() )
     {
-        // For now, we don't have an id. Later we could
-        // try finding the tool.
-        OnRightClick((int)-1, event.GetX(), event.GetY());
+        // find the tool under the mouse
+        wxCoord x,y;
+        event.GetPosition(&x, &y);
+
+        wxToolBarToolBase *tool = FindToolForPosition(x, y);
+        OnRightClick(tool ? tool->GetId() : -1, x, y);
     }
     else
     {