diff --git a/src/com/sk89q/worldedit/WorldEdit.java b/src/com/sk89q/worldedit/WorldEdit.java
index cd172420d..cf149c3a5 100644
--- a/src/com/sk89q/worldedit/WorldEdit.java
+++ b/src/com/sk89q/worldedit/WorldEdit.java
@@ -570,7 +570,13 @@ public class WorldEdit {
     public boolean handleRightClick(LocalPlayer player) {
         LocalSession session = getSession(player);
         
-        if (player.getItemInHand() == config.navigationWand) {
+        if (player.isHoldingPickAxe()) {
+            if (session.getArmSwingMode() != null) {
+                session.getArmSwingMode().act(server, config,
+                        player, session, null);
+                return true;
+            }
+        } else if (player.getItemInHand() == config.navigationWand) {
             CompassMode mode = session.getCompassMode();
             
             if (mode == CompassMode.JUMPTO) {