diff --git a/package.json b/package.json
index 7f0ad447..531e6b98 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "standardnotes-mobile",
-  "version": "3.9.5",
-  "user-version": "3.9.5",
+  "version": "3.9.6",
+  "user-version": "3.9.6",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
@@ -27,7 +27,7 @@
     "@react-navigation/native": "^5.9.3",
     "@react-navigation/stack": "^5.14.3",
     "@standardnotes/sncrypto-common": "1.5.2",
-    "@standardnotes/snjs": "2.20.1",
+    "@standardnotes/snjs": "2.20.3",
     "js-base64": "^3.5.2",
     "moment": "^2.29.1",
     "react": "17.0.1",
@@ -55,7 +55,7 @@
     "react-native-url-polyfill": "^1.3.0",
     "react-native-vector-icons": "^7.1.0",
     "react-native-version-info": "^1.1.0",
-    "react-native-webview": "^11.0.3",
+    "react-native-webview": "11.0.3",
     "react-navigation-header-buttons": "^6.0.2",
     "sn-textview": "standardnotes/sn-textview#14cd6fded5c746569a9c6c365d2edc41913811bb",
     "standard-notes-rn": "standardnotes/standard-notes-rn#d8e5c21b049dd4b97006688617736efbdb7dc4e7",
diff --git a/src/lib/keychain.ts b/src/lib/keychain.ts
index ad8882ba..7c100091 100644
--- a/src/lib/keychain.ts
+++ b/src/lib/keychain.ts
@@ -21,7 +21,7 @@ export default class Keychain {
     return RCTKeychain.getGenericPassword()
       .then(function (credentials) {
         if (!credentials || !credentials.password) {
-          console.log('===Keychain value missing===');
+          console.log('Keychain value empty');
           return null;
         } else {
           const keys = JSON.parse(credentials.password);
diff --git a/src/screens/Compose/ComponentView.tsx b/src/screens/Compose/ComponentView.tsx
index 877cb563..1935ce33 100644
--- a/src/screens/Compose/ComponentView.tsx
+++ b/src/screens/Compose/ComponentView.tsx
@@ -157,12 +157,13 @@ export const ComponentView = ({
 
     // deinit
     return () => {
+      application?.componentManager.onComponentIframeDestroyed(componentUuid);
       application?.componentGroup.deactivateComponentForArea(
         ComponentArea.Editor
       );
       liveComponent?.deinit();
     };
-  }, [application, liveComponent]);
+  }, [application, liveComponent, componentUuid]);
 
   const onMessage = (event: WebViewMessageEvent) => {
     let data;
diff --git a/src/screens/Compose/Compose.tsx b/src/screens/Compose/Compose.tsx
index 04d95ddf..035df6ab 100644
--- a/src/screens/Compose/Compose.tsx
+++ b/src/screens/Compose/Compose.tsx
@@ -325,11 +325,11 @@ export class Compose extends React.Component<{}, State> {
       }
     } else if (associatedEditor.uuid !== this.state.editorComponent?.uuid) {
       await this.context?.componentGroup.activateComponent(associatedEditor);
+    } else {
+      this.context?.componentManager!.contextItemDidChangeInArea(
+        ComponentArea.Editor
+      );
     }
-
-    this.context?.componentManager!.contextItemDidChangeInArea(
-      ComponentArea.Editor
-    );
   };
 
   saveNote = async (
diff --git a/yarn.lock b/yarn.lock
index 1e969380..fc41aa78 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1662,10 +1662,10 @@
   resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.5.2.tgz#be9404689d94f953c68302609a4f76751eaa82cd"
   integrity sha512-+OQ6gajTcVSHruw33T52MHyBDKL1vRCfQBXQn4tt4+bCfBAe+PFLkEQMHp35bg5twCfg9+wUf2KhmNNSNyBBZw==
 
-"@standardnotes/snjs@2.20.1":
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.20.1.tgz#4813adbfd16a1c373357bd4c7ece3085abf142b4"
-  integrity sha512-wJILt7YerLFaZTKoIZaCkqSuvpVWoVKqCVjP0KNHrMknnbgMHZygHqrb9sr57JL1AcNCkAULEFS/kev2GYTG3Q==
+"@standardnotes/snjs@2.20.3":
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.20.3.tgz#11fe962dfb017be459e856b9fbc6311c5046a0b0"
+  integrity sha512-FHog3p3SuMvTXsEl76UenbjY8PS6VL/b6MjaC9whJR5ZwsvmLwE0G16dWZ+z+izm+CsRaHMWU8R2cy7RG7HjZg==
   dependencies:
     "@standardnotes/auth" "^3.8.1"
     "@standardnotes/common" "^1.2.1"
@@ -6980,7 +6980,7 @@ react-native-version-info@^1.1.0:
   resolved "https://registry.yarnpkg.com/react-native-version-info/-/react-native-version-info-1.1.0.tgz#1407de863cae4dbbeeadb9c173a295a7774b6884"
   integrity sha512-0QmJjdKyaW+G/TiOWkwzGVv1G3FPnWrPH5SYWloUpv8WA7onuQESYHdLyjfCUInYI/FHVeEynE2VomOOsda8wQ==
 
-react-native-webview@^11.0.3:
+react-native-webview@11.0.3:
   version "11.0.3"
   resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-11.0.3.tgz#7235ee46d3df30443734bd5e5ba3c28588413e83"
   integrity sha512-or0MP5JthBGXX1/MNePdR7NC0LJXtr1F0yb0wrvEZ0iqSl1xh4yJ4s225qpkPdq3m8bDWMUpM0FGKad26rddOg==