diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 4314d2c68..0fa66b537 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -1178,11 +1178,11 @@ public class JavaEditor extends Editor {
       Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Over' menu item");
       debugger.stepOver();
 
-    } else if ((modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0) {
+    } else if ((modifiers & ActionEvent.SHIFT_MASK) != 0) {
       Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Into' menu item");
       debugger.stepInto();
 
-    } else if ((modifiers & KeyEvent.ALT_DOWN_MASK) != 0) {
+    } else if ((modifiers & ActionEvent.ALT_MASK) != 0) {
       Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Out' menu item");
       debugger.stepOut();
     }
@@ -1494,7 +1494,7 @@ public class JavaEditor extends Editor {
     item = Toolkit.newJMenuItemShift(Language.text("menu.debug.step_into"), KeyEvent.VK_J);
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
-          handleStep(KeyEvent.SHIFT_DOWN_MASK);
+          handleStep(ActionEvent.SHIFT_MASK);
         }
       });
     debugMenu.add(item);
@@ -1503,7 +1503,7 @@ public class JavaEditor extends Editor {
     item = Toolkit.newJMenuItemAlt(Language.text("menu.debug.step_out"), KeyEvent.VK_J);
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
-          handleStep(KeyEvent.ALT_DOWN_MASK);
+          handleStep(ActionEvent.ALT_MASK);
         }
       });
     debugMenu.add(item);
diff --git a/java/src/processing/mode/java/JavaToolbar.java b/java/src/processing/mode/java/JavaToolbar.java
index 6ac83ca88..105b3596d 100644
--- a/java/src/processing/mode/java/JavaToolbar.java
+++ b/java/src/processing/mode/java/JavaToolbar.java
@@ -79,7 +79,7 @@ public class JavaToolbar extends EditorToolbar {
                                     Language.text("menu.debug.step_out")) {
         @Override
         public void actionPerformed(ActionEvent e) {
-          final int mask = KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK;
+          final int mask = ActionEvent.SHIFT_MASK | ActionEvent.ALT_MASK;
           jeditor.handleStep(e.getModifiers() & mask);
         }
       };