diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp
index de348741e..6ae1cc377 100644
--- a/src/app/ui/editor/standby_state.cpp
+++ b/src/app/ui/editor/standby_state.cpp
@@ -497,6 +497,14 @@ bool StandbyState::onKeyDown(Editor* editor, KeyMessage* msg)
   Keys keys = KeyboardShortcuts::instance()
     ->getDragActionsFromKeyMessage(KeyContext::MouseWheel, msg);
   if (!keys.empty()) {
+    // Don't enter DraggingValueState to change brush size if we are
+    // in a selection-like tool
+    if (keys.size() == 1 &&
+        keys[0]->wheelAction() == WheelAction::BrushSize &&
+        editor->getCurrentEditorInk()->isSelection()) {
+      return false;
+    }
+
     EditorStatePtr newState(new DraggingValueState(editor, keys));
     editor->setState(newState);
     return true;