diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java
index cc76c70a6629..392540718d64 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java
@@ -146,7 +146,7 @@ public final class IdeMouseEventDispatcher {
     boolean ignore = false;
     if (!(e.getID() == MouseEvent.MOUSE_PRESSED ||
           e.getID() == MouseEvent.MOUSE_RELEASED ||
-          //TODO:e.getID() == MOUSE_WHEEL ||
+          e.getID() == MOUSE_WHEEL && 0 < e.getModifiersEx() ||
           e.getID() == MOUSE_CLICKED)) {
       ignore = true;
     }
@@ -251,7 +251,7 @@ public final class IdeMouseEventDispatcher {
       if (actions.length > 0 && e.isConsumed())
         return true;
     }
-    return button > 3;
+    return e.getButton() > 3;
   }
 
   private static void resetPopupTrigger(final MouseEvent e) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java
index 975ba65b41cb..ef1516f833af 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java
@@ -290,6 +290,11 @@ class MouseShortcutDialog extends DialogWrapper{
       // See bug ID 4109826 on Sun's bug parade.
       //cast is needed in order to compile with mustang
       MouseAdapter adapter = new MouseAdapter() {
+        @Override
+        public void mouseWheelMoved(MouseWheelEvent e) {
+          mouseReleased(e);
+        }
+
         public void mouseReleased(MouseEvent e){
           Component component= SwingUtilities.getDeepestComponentAt(e.getComponent(),e.getX(),e.getY());
           if(component== MyClickPad.this){