diff --git a/ionic/components/input/test/stacked-labels/main.html b/ionic/components/input/test/stacked-labels/main.html
index b5a3e11c38..ca59b8a602 100644
--- a/ionic/components/input/test/stacked-labels/main.html
+++ b/ionic/components/input/test/stacked-labels/main.html
@@ -16,6 +16,7 @@
     <ion-item>
       <ion-label stacked>Label 2</ion-label>
       <ion-input value="Text 2"></ion-input>
+      <button item-right clear><ion-icon name="heart"></ion-icon></button>
     </ion-item>
 
     <ion-item>
diff --git a/ionic/components/label/label.scss b/ionic/components/label/label.scss
index 3ca9788cbd..d08852ec33 100644
--- a/ionic/components/label/label.scss
+++ b/ionic/components/label/label.scss
@@ -34,10 +34,9 @@ ion-label[fixed] {
   max-width: 200px;
 }
 
-.item-label-stacked,
-.item-label-floating {
-  flex-direction: column;
-  align-items: flex-start;
+.item-label-stacked .item-inner,
+.item-label-floating .item-inner {
+  flex-wrap: wrap;
 }
 
 ion-label[stacked],
@@ -45,6 +44,7 @@ ion-label[floating] {
   align-self: stretch;
   margin-bottom: 0;
   max-width: 100%;
+  flex-basis: 100%;
 }
 
 ion-label[stacked],