diff --git a/nui/src/main/java/org/terasology/nui/widgets/UIButton.java b/nui/src/main/java/org/terasology/nui/widgets/UIButton.java
index d7fedce815..fc6110a1b1 100644
--- a/nui/src/main/java/org/terasology/nui/widgets/UIButton.java
+++ b/nui/src/main/java/org/terasology/nui/widgets/UIButton.java
@@ -90,7 +90,7 @@ public boolean onMouseClick(NUIMouseClickEvent event) {
         @Override
         public void onMouseRelease(NUIMouseReleaseEvent event) {
             if (event.getMouseButton() == MouseInput.MOUSE_LEFT) {
-                if (isMouseOver()) {
+                if (isMouseOver() && isEnabled()) {
                     activateWidget();
                 }
                 down = false;
@@ -152,7 +152,7 @@ public void onDraw(Canvas canvas) {
             canvas.drawTexture(image.get());
         }
         canvas.drawText(text.get());
-        if (isEnabled()) {
+        if (isEnabled() || down) {
             canvas.addInteractionRegion(interactionListener);
         }
     }