2 files changed, 8 insertions, 5 deletions
diff --git a/WebContent/VAADIN/themes/base/upload/upload.scss b/WebContent/VAADIN/themes/base/upload/upload.scss
index e705fc1c78..f8e707446c 100644
--- a/WebContent/VAADIN/themes/base/upload/upload.scss
+++ b/WebContent/VAADIN/themes/base/upload/upload.scss
@@ -4,12 +4,11 @@
 	white-space: nowrap;
 }
 
-
 .#{$primaryStyleName}-immediate {
 	position: relative;
 	margin: 0;
 	overflow: hidden;
-	.v-button{
+	.v-button {
 		width:100%;
     }
 }
@@ -39,4 +38,4 @@
 	text-align: left;
 }
 
-}
-\ No newline at end of file
+}
diff --git a/WebContent/VAADIN/themes/valo/components/_upload.scss b/WebContent/VAADIN/themes/valo/components/_upload.scss
index c301be060a..07a51f03ef 100644
--- a/WebContent/VAADIN/themes/valo/components/_upload.scss
+++ b/WebContent/VAADIN/themes/valo/components/_upload.scss
@@ -1,7 +1,7 @@
 /**
  *
  *
- * @param {string} $primary-stylename (v-upload) - 
+ * @param {string} $primary-stylename (v-upload) -
  *
  * @group upload
  */
@@ -10,6 +10,10 @@
     @include valo-widget-style;
   }
 
+  .#{$primary-stylename}-immediate .v-button {
+    width: 100%;
+  }
+
   .#{$primary-stylename}-immediate input[type="file"] {
     @include opacity(0);
     z-index: 2;
@@ -20,4 +24,4 @@
     border: none;
     background: transparent;
   }
-}
-\ No newline at end of file
+}