1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 92e578baad..a373216908 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -473,7 +473,9 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
 
         @Override
         public void handleAction(Object sender, Object target) {
-            button.fireClick();
+            if (button.isEnabled() && !button.isReadOnly()) {
+                button.fireClick();
+            }
         }
     }