diff --git a/src/control/Control.cpp b/src/control/Control.cpp
index a58d0269..5a30f003 100644
--- a/src/control/Control.cpp
+++ b/src/control/Control.cpp
@@ -1678,20 +1678,19 @@ void Control::toolChanged() {
     fireEnableAction(ACTION_SHAPE_RECOGNIZER, toolHandler->hasCapability(TOOL_CAP_RECOGNIZER));
 
     bool enableSize = toolHandler->hasCapability(TOOL_CAP_SIZE);
-
     fireEnableAction(ACTION_SIZE_MEDIUM, enableSize);
     fireEnableAction(ACTION_SIZE_THICK, enableSize);
     fireEnableAction(ACTION_SIZE_FINE, enableSize);
     fireEnableAction(ACTION_SIZE_VERY_THICK, enableSize);
     fireEnableAction(ACTION_SIZE_VERY_FINE, enableSize);
+    if (enableSize) {
+        toolSizeChanged();
+    }
 
     bool enableFill = toolHandler->hasCapability(TOOL_CAP_FILL);
-
     fireEnableAction(ACTION_TOOL_FILL, enableFill);
-
-
-    if (enableSize) {
-        toolSizeChanged();
+    if (enableFill) {
+        toolFillChanged();
     }
 
     // Update color