diff --git a/src/popup/app/vault/vaultAddCipherController.js b/src/popup/app/vault/vaultAddCipherController.js
index 4c9d506f6bf..7e77895a061 100644
--- a/src/popup/app/vault/vaultAddCipherController.js
+++ b/src/popup/app/vault/vaultAddCipherController.js
@@ -88,6 +88,12 @@ angular
             }
         };
 
+        $scope.showPassword = false;
+        $scope.togglePassword = function () {
+            $analytics.eventTrack('Toggled Password');
+            $scope.showPassword = !$scope.showPassword;
+        };
+
         $scope.addField = function (type) {
             if (!$scope.cipher.fields) {
                 $scope.cipher.fields = [];
diff --git a/src/popup/app/vault/vaultEditCipherController.js b/src/popup/app/vault/vaultEditCipherController.js
index d77a8640b3f..80cbf7c2008 100644
--- a/src/popup/app/vault/vaultEditCipherController.js
+++ b/src/popup/app/vault/vaultEditCipherController.js
@@ -105,6 +105,12 @@ angular
             }
         };
 
+        $scope.showPassword = false;
+        $scope.togglePassword = function () {
+            $analytics.eventTrack('Toggled Password');
+            $scope.showPassword = !$scope.showPassword;
+        };
+
         $scope.addField = function (type) {
             if (!$scope.cipher.fields) {
                 $scope.cipher.fields = [];
diff --git a/src/popup/app/vault/views/vaultAddCipher.html b/src/popup/app/vault/views/vaultAddCipher.html
index 1f09880a976..b39fd02ccb9 100644
--- a/src/popup/app/vault/views/vaultAddCipher.html
+++ b/src/popup/app/vault/views/vaultAddCipher.html
@@ -38,9 +38,16 @@
                             <label for="loginUsername" class="item-label">{{i18n.username}}</label>
                             <input id="loginUsername" type="text" name="Login.Username" ng-model="cipher.login.username">
                         </div>
-                        <div class="list-section-item">
-                            <label for="loginPassword" class="item-label">{{i18n.password}}</label>
-                            <input id="loginPassword" type="password" name="Login.Password" ng-model="cipher.login.password">
+                        <div class="list-section-item flex">
+                            <div class="flex-grow">
+                                <label for="loginPassword" class="item-label">{{i18n.password}}</label>
+                                <input id="loginPassword" type="{{showPassword ? 'text' : 'password'}}" name="Login.Password" ng-model="cipher.login.password">
+                            </div>
+                            <div class="action-buttons">
+                                <a class="btn-list" href="" title="{{i18n.togglePassword}}" ng-click="togglePassword()">
+                                    <i class="fa fa-lg" ng-class="[{'fa-eye': !showPassword}, {'fa-eye-slash': showPassword}]"></i>
+                                </a>
+                            </div>
                         </div>
                         <a class="list-section-item" href="" ng-click="generatePassword()">
                             {{i18n.generatePassword}}
diff --git a/src/popup/app/vault/views/vaultEditCipher.html b/src/popup/app/vault/views/vaultEditCipher.html
index 8aa0f66edd7..70c08f999e7 100644
--- a/src/popup/app/vault/views/vaultEditCipher.html
+++ b/src/popup/app/vault/views/vaultEditCipher.html
@@ -31,9 +31,16 @@
                             <label for="loginUsername" class="item-label">{{i18n.username}}</label>
                             <input id="loginUsername" type="text" name="Login.Username" ng-model="cipher.login.username">
                         </div>
-                        <div class="list-section-item">
-                            <label for="loginPassword" class="item-label">{{i18n.password}}</label>
-                            <input id="loginPassword" type="password" name="Login.Password" ng-model="cipher.login.password">
+                        <div class="list-section-item flex">
+                            <div class="flex-grow">
+                                <label for="loginPassword" class="item-label">{{i18n.password}}</label>
+                                <input id="loginPassword" type="{{showPassword ? 'text' : 'password'}}" name="Login.Password" ng-model="cipher.login.password">
+                            </div>
+                            <div class="action-buttons">
+                                <a class="btn-list" href="" title="{{i18n.togglePassword}}" ng-click="togglePassword()">
+                                    <i class="fa fa-lg" ng-class="[{'fa-eye': !showPassword}, {'fa-eye-slash': showPassword}]"></i>
+                                </a>
+                            </div>
                         </div>
                         <a class="list-section-item" href="" ng-click="generatePassword()">
                             {{i18n.generatePassword}}
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index b3e8e506fe5..b1e36eb8dd4 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -432,6 +432,14 @@
             overflow-wrap: break-word;
         }
 
+        &.flex {
+            display: flex;
+        }
+
+        .flex-grow {
+            flex-grow: 1;
+        }
+
         input:not([type="checkbox"]), select, textarea {
             border: none;
             width: 100%;