diff --git a/app/assets/javascripts/components/NotesOptionsPanel.tsx b/app/assets/javascripts/components/NotesOptionsPanel.tsx
index 93299f2d4..34ecb023d 100644
--- a/app/assets/javascripts/components/NotesOptionsPanel.tsx
+++ b/app/assets/javascripts/components/NotesOptionsPanel.tsx
@@ -71,7 +71,7 @@ export const NotesOptionsPanel = observer(({ appState }: Props) => {
             ...position,
             maxHeight
           }}
-          className="sn-dropdown max-h-120 max-w-80 flex flex-col py-2 overflow-y-scroll fixed"
+          className="sn-dropdown sn-dropdown--animated max-h-120 max-w-80 flex flex-col py-2 overflow-y-scroll fixed"
         >
           {open && (
             <NotesOptions
diff --git a/app/assets/javascripts/components/SearchOptions.tsx b/app/assets/javascripts/components/SearchOptions.tsx
index 193515ede..d9ca46dc5 100644
--- a/app/assets/javascripts/components/SearchOptions.tsx
+++ b/app/assets/javascripts/components/SearchOptions.tsx
@@ -63,7 +63,7 @@ const SearchOptions = observer(({ appState }: Props) => {
         style={{
           top: optionsPanelTop,
         }}
-        className="sn-dropdown sn-dropdown-anchor-right absolute grid gap-2 py-2"
+        className="sn-dropdown sn-dropdown--anchor-right sn-dropdown--animated absolute grid gap-2 py-2"
       >
         <Switch
           className="h-10"
diff --git a/app/assets/javascripts/directives/views/componentView.ts b/app/assets/javascripts/directives/views/componentView.ts
index 641b8e5ac..85b18c29d 100644
--- a/app/assets/javascripts/directives/views/componentView.ts
+++ b/app/assets/javascripts/directives/views/componentView.ts
@@ -156,6 +156,9 @@ class ComponentViewCtrl implements ComponentViewScope {
           case (ComponentAction.KeyUp):
             this.application.io.handleComponentKeyUp(data.keyboardModifier);
             break;
+          case (ComponentAction.Click):
+            this.application.getAppState().notes.setContextMenuOpen(false);
+            break;
           default:
             return;
         }
diff --git a/app/assets/javascripts/views/notes/notes_view.ts b/app/assets/javascripts/views/notes/notes_view.ts
index cfbbaf40b..1708d0db6 100644
--- a/app/assets/javascripts/views/notes/notes_view.ts
+++ b/app/assets/javascripts/views/notes/notes_view.ts
@@ -400,6 +400,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesCtrlState> {
   }
 
   async createNewNote() {
+    this.appState.notes.unselectNotes();
     let title = `Note ${this.state.notes.length + 1}`;
     if (this.isFiltering()) {
       title = this.state.noteFilter.text;
diff --git a/app/assets/stylesheets/_sn.scss b/app/assets/stylesheets/_sn.scss
index 9a4f00026..1b3edcc12 100644
--- a/app/assets/stylesheets/_sn.scss
+++ b/app/assets/stylesheets/_sn.scss
@@ -208,21 +208,24 @@
 .sn-dropdown {
   @extend .bg-default;
   @extend .min-w-80;
-  @extend .transition-transform;
-  @extend .duration-150;
-  @extend .slide-down-animation;
   @extend .rounded;
   @extend .box-shadow;
 
   z-index: $z-index-dropdown-menu;
 
-  &.sn-dropdown-anchor-right {
+  &.sn-dropdown--anchor-right {
     right: 0;
   }
 
   &[data-state='collapsed'] {
     display: none;
   }
+  
+  &.sn-dropdown--animated {
+    @extend .transition-transform;
+    @extend .duration-150;
+    @extend .slide-down-animation;
+  }
 }
 
 /** Lesser specificity will give priority to reach's styles */
diff --git a/package.json b/package.json
index 1887b5cbe..ae9f6e99e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.7.0-beta01",
+  "version": "3.7.0",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",
@@ -71,7 +71,7 @@
     "@reach/checkbox": "^0.13.2",
     "@reach/dialog": "^0.13.0",
     "@standardnotes/sncrypto-web": "1.2.10",
-    "@standardnotes/snjs": "2.3.0",
+    "@standardnotes/snjs": "2.3.1",
     "mobx": "^6.1.6",
     "mobx-react-lite": "^3.2.0",
     "preact": "^10.5.12"
diff --git a/yarn.lock b/yarn.lock
index bd05813de..2ce16916e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1936,10 +1936,10 @@
     "@standardnotes/sncrypto-common" "^1.2.7"
     libsodium-wrappers "^0.7.8"
 
-"@standardnotes/snjs@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.3.0.tgz#52f6b5458e348e77642f922dd4302ad8c6d28914"
-  integrity sha512-4xlLcVKJznhqCTKWy4IhYPbnxc3k66fzBeTdWJqZZ/n0vOT2l1/ybCRrPP0os/7NFCtK3CqInApbzZP6xXUhuA==
+"@standardnotes/snjs@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.3.1.tgz#48b68050ac4c4616bebab0128fd093cad0d65ea7"
+  integrity sha512-PTWt5R4OTrbyMKX8eTr/fc6Z0o4WrOJucDfMUWBQeIajHQg7V3MHpp0PArz+SS1Qdj3n7eVdl5qyHFjymL3C/w==
   dependencies:
     "@standardnotes/auth" "^2.0.0"
     "@standardnotes/sncrypto-common" "^1.2.9"