diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index 6cae5aec..c1c57c18 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -8,7 +8,7 @@
     <div ng-if="logins.length">
         <div class="list">
             <div class="list-grouped">
-                <a href="javascript:void(0)" ng-click="fillLogin(login)" class="list-grouped-item condensed"
+                <a href="#" stop-click ng-click="fillLogin(login)" class="list-grouped-item condensed"
                    title="{{i18n.autoFill}} {{login.name}}"
                    ng-repeat="login in theLogins = (logins | orderBy: [sortUriMatch, 'name', 'username']) track by $index">
                     <span class="btn-list" href="" ng-click="$event.stopPropagation()" title="{{i18n.copyPassword}}"
diff --git a/src/popup/app/directives/stopClickDirective.js b/src/popup/app/directives/stopClickDirective.js
new file mode 100644
index 00000000..d1998285
--- /dev/null
+++ b/src/popup/app/directives/stopClickDirective.js
@@ -0,0 +1,11 @@
+angular
+    .module('bit.directives')
+
+    // ref: https://stackoverflow.com/a/14165848/1090359
+    .directive('stopClick', function () {
+        return function (scope, element, attrs) {
+            $(element).click(function (event) {
+                event.preventDefault();
+            });
+        };
+    });
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index f8cbf6a0..4ffd1152 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -18,7 +18,7 @@
                     {{i18n.folders}}
                     <span>{{vaultFolders.length}}</span>
                 </div>
-                <a href="javascript:void(0)" ng-click="viewFolder(folder)" class="list-section-item"
+                <a href="#" stop-click ng-click="viewFolder(folder)" class="list-section-item"
                    ng-repeat="folder in vaultFolders | orderBy: folderSort track by $index">
                     {{folder.name}}
                     <i class="fa fa-chevron-right fa-lg"></i>
@@ -35,7 +35,7 @@
                     <small>{{vaultFolderLogins.length}}</small>
                     <i class="fa fa-folder-open"></i> {{folder.name}}
                 </div>
-                <a href="javascript:void(0)" ng-click="viewLogin(login)"
+                <a href="#" stop-click ng-click="viewLogin(login)"
                    class="list-grouped-item condensed" title="{{i18n.edit}} {{login.name}}"
                    ng-repeat="login in vaultFolderLogins = (vaultLogins | filter: { folderId: folder.id }
                             | filter: searchLogins() | orderBy: ['name', 'username']) track by $index">
diff --git a/src/popup/app/vault/views/vaultViewFolder.html b/src/popup/app/vault/views/vaultViewFolder.html
index bd54c45f..04320f89 100644
--- a/src/popup/app/vault/views/vaultViewFolder.html
+++ b/src/popup/app/vault/views/vaultViewFolder.html
@@ -19,7 +19,7 @@
                     {{folder.name}}
                     <span>{{vaultLogins.length}}</span>
                 </div>
-                <a href="javascript:void(0)" ng-click="viewLogin(login)"
+                <a href="#" stop-click ng-click="viewLogin(login)"
                    class="list-section-item condensed" title="{{i18n.edit}} {{login.name}}"
                    ng-repeat="login in pagedVaultLogins track by $index">
                     <span class="btn-list" ng-click="$event.stopPropagation()" title="{{i18n.copyPassword}}" ngclipboard
diff --git a/src/popup/index.html b/src/popup/index.html
index 7285483a..d3d0d753 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -40,6 +40,7 @@
 
     <script src="app/directives/directivesModule.js"></script>
     <script src="app/directives/formDirective.js"></script>
+    <script src="app/directives/stopClickDirective.js"></script>
 
     <script src="app/services/servicesModule.js"></script>
     <script src="app/services/backgroundService.js"></script>