diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index 478c897e97..959757e4b2 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -1,5 +1,7 @@
 <div class="header">
-    <a class="right" ui-sref="addSite({animation: 'in-slide-up'})"><i class="fa fa-plus fa-lg"></i></a>
+    <div class="right">
+        <a ui-sref="addSite({animation: 'in-slide-up'})"><i class="fa fa-plus fa-lg"></i></a>
+    </div>
     <div class="title">My Vault</div>
 </div>
 <div class="content content-tabs">
diff --git a/src/popup/app/vault/views/vaultAddSite.html b/src/popup/app/vault/views/vaultAddSite.html
index 540a27e535..2a971b3afb 100644
--- a/src/popup/app/vault/views/vaultAddSite.html
+++ b/src/popup/app/vault/views/vaultAddSite.html
@@ -1,7 +1,11 @@
 <form name="theForm" ng-submit="theForm.$valid && save(site)">
     <div class="header">
-        <a ng-click="close()" href class="left">Close</a>
-        <button type="submit" class="right btn btn-link">Save</button>
+        <div class="left">
+            <a ng-click="close()" href>Close</a>
+        </div>
+        <div class="right">
+            <button type="submit" class="btn btn-link">Save</button>
+        </div>
         <div class="title">Add Site</div>
     </div>
     <div class="content">
diff --git a/src/popup/app/vault/views/vaultViewSite.html b/src/popup/app/vault/views/vaultViewSite.html
index c89a19e21f..11db2a36e8 100644
--- a/src/popup/app/vault/views/vaultViewSite.html
+++ b/src/popup/app/vault/views/vaultViewSite.html
@@ -1,6 +1,10 @@
 <div class="header">
-    <a ui-sref="tabs.vault({animation: 'out-slide-down'})" class="left">Close</a>
-    <a href="#" class="right">Edit</a>
+    <div class="left">
+        <a ui-sref="tabs.vault({animation: 'out-slide-down'})">Close</a>
+    </div>
+    <div class="right">
+        <a href="#">Edit</a>
+    </div>
     <div class="title">View Site</div>
 </div>
 <div class="content">
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index 17ec2a31d8..63c345f6e4 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -13,6 +13,7 @@
     left: 0;
     right: 0;
     overflow: hidden;
+    position: relative;
 
     a, button {
         color: white !important;
@@ -29,21 +30,30 @@
         font-weight: bold;
         display: block;
         padding: 12px 0;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
     }
 
     .left {
-        float: left;
         display: block;
-        padding: 12px 10px;
+        position: absolute;
+        left: 0;
+
+        a, button {
+            padding: 12px 10px;
+            display: block;
+            float: left;
+        }
     }
 
     .right {
-        float: right;
         display: block;
-        padding: 12px 10px;
+        right: 0;
+        position: absolute;
+
+        a, button {
+            padding: 12px 10px;
+            display: block;
+            float: right;
+        }
     }
 }