diff --git a/src/popup/app/current/currentController.js b/src/popup/app/current/currentController.js
index 7d1e7300af..eee9672362 100644
--- a/src/popup/app/current/currentController.js
+++ b/src/popup/app/current/currentController.js
@@ -96,9 +96,7 @@ angular
             }
         };
 
-        $scope.viewLogin = function (login, e) {
-            e.stopPropagation();
-
+        $scope.viewLogin = function (login) {
             $state.go('viewLogin', {
                 loginId: login.id,
                 animation: 'in-slide-up',
diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index c1c57c18b5..94485e9964 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -11,19 +11,19 @@
                 <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}}"
+                    <span class="btn-list" stop-prop stop-click title="{{i18n.copyPassword}}"
                           ngclipboard ngclipboard-error="clipboardError(e)"
                           ngclipboard-success="clipboardSuccess(e, i18n.password)"
                           data-clipboard-text="{{login.password}}" ng-class="{'disabled': !login.password}">
                         <i class="fa fa-lg fa-key"></i>
                     </span>
-                    <span class="btn-list" href="" ng-click="$event.stopPropagation()" title="{{i18n.copyUsername}}"
+                    <span class="btn-list" stop-prop stop-click title="{{i18n.copyUsername}}"
                           ngclipboard ngclipboard-error="clipboardError(e)"
                           ngclipboard-success="clipboardSuccess(e, i18n.username)"
                           data-clipboard-text="{{login.username}}" ng-class="{'disabled': !login.username}">
                         <i class="fa fa-lg fa-user"></i>
                     </span>
-                    <span class="btn-list" href="" ng-click="viewLogin(login, $event) && $event.stopPropagation()"
+                    <span class="btn-list" ng-click="viewLogin(login)" stop-prop stop-click
                           title="{{i18n.edit}} {{login.name}}">
                         <i class="fa fa-lg fa-pencil"></i>
                     </span>
diff --git a/src/popup/app/directives/stopPropDirective.js b/src/popup/app/directives/stopPropDirective.js
new file mode 100644
index 0000000000..9dc5eb0233
--- /dev/null
+++ b/src/popup/app/directives/stopPropDirective.js
@@ -0,0 +1,10 @@
+angular
+    .module('bit.directives')
+
+    .directive('stopProp', function () {
+        return function (scope, element, attrs) {
+            $(element).click(function (event) {
+                event.stopPropagation();
+            });
+        };
+    });
\ No newline at end of file
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index 4ffd115203..516f19e9ff 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -39,12 +39,12 @@
                    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">
-                    <span class="btn-list" ng-click="$event.stopPropagation()" title="{{i18n.copyPassword}}" ngclipboard
+                    <span class="btn-list" stop-prop stop-click title="{{i18n.copyPassword}}" ngclipboard
                           ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, i18n.password)"
                           data-clipboard-text="{{login.password}}" ng-class="{'disabled': !login.password}">
                         <i class="fa fa-lg fa-key"></i>
                     </span>
-                    <span class="btn-list" ng-click="$event.stopPropagation()" title="{{i18n.copyUsername}}" ngclipboard
+                    <span class="btn-list" stop-prop stop-click title="{{i18n.copyUsername}}" ngclipboard
                           ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, i18n.username)"
                           data-clipboard-text="{{login.username}}" ng-class="{'disabled': !login.username}">
                         <i class="fa fa-lg fa-user"></i>
diff --git a/src/popup/app/vault/views/vaultViewFolder.html b/src/popup/app/vault/views/vaultViewFolder.html
index 04320f8940..1e989d56a4 100644
--- a/src/popup/app/vault/views/vaultViewFolder.html
+++ b/src/popup/app/vault/views/vaultViewFolder.html
@@ -22,12 +22,12 @@
                 <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
+                    <span class="btn-list" stop-prop stop-click title="{{i18n.copyPassword}}" ngclipboard
                           ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, i18n.password)"
                           data-clipboard-text="{{login.password}}" ng-class="{'disabled': !login.password}">
                         <i class="fa fa-lg fa-key"></i>
                     </span>
-                    <span class="btn-list" ng-click="$event.stopPropagation()" title="{{i18n.copyUsername}}" ngclipboard
+                    <span class="btn-list" stop-prop stop-click title="{{i18n.copyUsername}}" ngclipboard
                           ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, i18n.username)"
                           data-clipboard-text="{{login.username}}" ng-class="{'disabled': !login.username}">
                         <i class="fa fa-lg fa-user"></i>
diff --git a/src/popup/index.html b/src/popup/index.html
index d3d0d753b1..dc6ecc0bab 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -41,6 +41,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/directives/stopPropDirective.js"></script>
 
     <script src="app/services/servicesModule.js"></script>
     <script src="app/services/backgroundService.js"></script>