diff --git a/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java b/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java
index 6c10375..5b3d526 100644
--- a/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java
+++ b/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java
@@ -73,6 +73,10 @@ public class TagBufferAction extends JosmAction {
 
     @Override
     protected void updateEnabledState( Collection<? extends OsmPrimitive> selection ) {
+        if (isCalledFromLayerChange()) {
+            // #10350
+            return;
+        }
         // selection changed => check if selection is completely different from before
         boolean foundOld = false;
         if( selection != null ) {