diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index a3657957..66174af4 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -47,19 +47,18 @@
                 <button type="button" ng-click="addLogin(folder)" class="btn btn-default btn-flat">Add a Login</button>
             </div>
             <div class="table-responsive" ng-show="folderLogins.length">
-                <table class="table table-striped table-hover">
+                <table class="table table-striped table-hover table-selectable">
                     <thead>
                         <tr>
-                            <th style="width: 75px; min-width: 75px;"></th>
+                            <th style="width: 115px; min-width: 115px;"></th>
                             <th>Name</th>
                             <th style="width: 300px;">Username</th>
                         </tr>
                     </thead>
                     <tbody>
                         <tr ng-repeat="login in folderLogins = (logins | filter: { folderId: folder.id } |
-                            filter: (main.searchVaultText || '') | orderBy: ['name', 'username'])"
-                            ng-click="editLogin(login)">
-                            <td>
+                            filter: (main.searchVaultText || '') | orderBy: ['name', 'username'])">
+                            <td class="actions">
                                 <button type="button" ng-click="deleteLogin(login)" class="btn btn-link btn-table"
                                         uib-tooltip="Delete">
                                     <i class="fa fa-lg fa-trash"></i>
@@ -68,12 +67,20 @@
                                         uib-tooltip="View/Edit">
                                     <i class="fa fa-lg fa-pencil"></i>
                                 </button>
+                                <button type="button" ng-click="shareLogin(login)" class="btn btn-link btn-table"
+                                        uib-tooltip="Share">
+                                    <i class="fa fa-lg fa-user-plus"></i>
+                                </button>
                             </td>
-                            <td>
-                                {{login.name}}
-                                <i class="fa fa-star text-muted" uib-tooltip="Favorite" ng-show="login.favorite"></i>
+                            <td ng-click="editLogin(login)">
+                                <span ng-click="$event.stopPropagation()">
+                                    {{login.name}}
+                                    <i class="fa fa-star text-muted" uib-tooltip="Favorite" ng-show="login.favorite"></i>
+                                </span>
+                            </td>
+                            <td ng-click="editLogin(login)">
+                                <span ng-click="$event.stopPropagation()">{{login.username}}</span>
                             </td>
-                            <td>{{login.username}}</td>
                         </tr>
                     </tbody>
                 </table>
diff --git a/src/less/vault.less b/src/less/vault.less
index e99f480e..7d95e5d1 100644
--- a/src/less/vault.less
+++ b/src/less/vault.less
@@ -119,6 +119,18 @@ form .btn .loading-icon {
     text-align: left;
 }
 
+/* Tables */
+
+.table-selectable {
+    td:not(.actions) {
+        cursor: pointer;
+
+        span {
+            cursor: text;
+        }
+    }
+}
+
 /* Callouts */
 
 .callout.callout-default {