diff --git a/pcbnew/tools/zone_filler_tool.cpp b/pcbnew/tools/zone_filler_tool.cpp
index 1b9a75edfb..9853a609e7 100644
--- a/pcbnew/tools/zone_filler_tool.cpp
+++ b/pcbnew/tools/zone_filler_tool.cpp
@@ -424,9 +424,12 @@ void ZONE_FILLER_TOOL::refresh()
 
 bool ZONE_FILLER_TOOL::IsZoneFillAction( const TOOL_EVENT* aEvent )
 {
-    return aEvent->IsAction( &PCB_ACTIONS::zoneFillAll )
-           || aEvent->IsAction( &PCB_ACTIONS::zoneFillDirty )
+    return aEvent->IsAction( &PCB_ACTIONS::zoneFill )
+           || aEvent->IsAction( &PCB_ACTIONS::zoneFillAll )
+           || aEvent->IsAction( &PCB_ACTIONS::zoneUnfill )
            || aEvent->IsAction( &PCB_ACTIONS::zoneUnfillAll );
+
+    // Don't include zoneFillDirty; that's a system action not a user action
 }