diff --git a/src/popup/app/vault/vaultViewSiteController.js b/src/popup/app/vault/vaultViewSiteController.js
index 06496c61..66cf9cd6 100644
--- a/src/popup/app/vault/vaultViewSiteController.js
+++ b/src/popup/app/vault/vaultViewSiteController.js
@@ -6,6 +6,15 @@
         siteService.get($stateParams.siteId, function (site) {
             cipherService.decryptSite(site).then(function (model) {
                 $scope.site = model;
+
+                if (model.password) {
+                    var maskedPassword = '';
+                    for (var i = 0; i < model.password.length; i++) {
+                        maskedPassword += '•';
+                    }
+
+                    $scope.site.maskedPassword = maskedPassword;
+                }
             });
         });
     });
diff --git a/src/popup/app/vault/views/vaultViewSite.html b/src/popup/app/vault/views/vaultViewSite.html
index 36e8e7fb..a48b0296 100644
--- a/src/popup/app/vault/views/vaultViewSite.html
+++ b/src/popup/app/vault/views/vaultViewSite.html
@@ -28,11 +28,11 @@
                 </div>
                 <div class="list-section-item">
                     <span class="item-label">Password</span>
-                    {{site.password}}
+                    {{site.maskedPassword}}
                 </div>
             </div>
         </div>
-        <div class="list-section">
+        <div class="list-section" ng-show="site.notes">
             <div class="list-section-header">
                 Notes
             </div>