1 files changed, 11 insertions, 0 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/VUpload.java b/client/src/main/java/com/vaadin/client/ui/VUpload.java
index 681eaaf2f2..7ec8fbb71f 100644
--- a/client/src/main/java/com/vaadin/client/ui/VUpload.java
+++ b/client/src/main/java/com/vaadin/client/ui/VUpload.java
@@ -226,6 +226,17 @@ public class VUpload extends SimplePanel {
             rebuildPanel();
             submitted = false;
         }
+        ensureUploadButton();
+
+    }
+
+    private void ensureUploadButton() {
+        //when push got enabled, need to ensure the upload is disabled properly
+        //check ticket #11652
+        if (fu.getElement().getParentElement().getParentElement()
+                .hasClassName("v-disabled")) {
+            disableUpload();
+        }
     }
 
     private void setEnabledForSubmitButton(boolean enabled) {