diff --git a/src/components/context.scss b/src/components/context.scss
index 4787b0b..c613fd9 100644
--- a/src/components/context.scss
+++ b/src/components/context.scss
@@ -8,6 +8,8 @@
     >button {
         margin: 0;
         display: block;
+        background-color: rgb(224, 224, 224);
+        color: black;
     }
 
     >*:not(:last-child) {
diff --git a/src/components/routes/vault/EntryList.tsx b/src/components/routes/vault/EntryList.tsx
index 5df4d94..98c66ba 100755
--- a/src/components/routes/vault/EntryList.tsx
+++ b/src/components/routes/vault/EntryList.tsx
@@ -59,6 +59,15 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
 
    onContext(evt: MouseEvent, note: BaseNote) {
       evt.preventDefault();
+      evt.stopPropagation();
+
+      const close = () => {
+         document.documentElement.removeEventListener("click", close);
+         this.setState({ context: undefined });
+      }
+      document.documentElement.addEventListener("click", close);
+
+
       const shareNote = async () => {
          let nav = window.navigator as any;
          if (nav.share !== undefined) {
@@ -82,7 +91,6 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
          }).catch(err => {
             Notifications.sendError(err);
          })
-
       }
 
       let share;
@@ -254,7 +262,7 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
          <div class="uk-container">
             <div style="display:flex;">
                <input class="uk-input" type="text" onKeyUp={this.searchChanged} ref={elm => this.searchInput = elm} />
-               <button class="uk-button" style="padding: 0 10px;">
+               <button class="uk-button uk-button-primary" style="padding: 0 10px;">
                   <Search />
                </button>
             </div>
diff --git a/src/components/routes/vaults/Vaults.tsx b/src/components/routes/vaults/Vaults.tsx
index 7aed7ab..d90cedd 100644
--- a/src/components/routes/vaults/Vaults.tsx
+++ b/src/components/routes/vaults/Vaults.tsx
@@ -127,12 +127,13 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
 
    onContext(evt: MouseEvent, vault: { name: string, encrypted: boolean, id: string }) {
       evt.preventDefault();
+      evt.stopPropagation();
 
       const close = () => {
-         window.removeEventListener("click", close);
+         document.documentElement.removeEventListener("click", close);
          this.setState({ context: undefined });
       }
-      window.addEventListener("click", close);
+      document.documentElement.addEventListener("click", close);
 
       let deleteb = <button class="uk-button" onClick={async () => {
          let delete_modal = new YesNoModal("Delete Vault? Cannot be undone!");
diff --git a/src/notes.ts b/src/notes.ts
index 357496b..71f7c68 100644
--- a/src/notes.ts
+++ b/src/notes.ts
@@ -172,7 +172,7 @@ class NotesProvider {
       }
       this.syncedObservableServer.send((await this.oplogDB.getAll()).length <= 0);
       let prs = this.apiLockRls.then(lock => lock.release());
-      prs.then(() => awaitTimeout(5000)).then(() => this.sync()).then(() => next());
+      prs.then(() => awaitTimeout(2000)).then(() => this.sync()).then(() => next());
       return prs;
    }