diff --git a/app/scripts/comp/extension/protocol-impl.js b/app/scripts/comp/extension/protocol-impl.js
index d8b1fdf0..7d172edb 100644
--- a/app/scripts/comp/extension/protocol-impl.js
+++ b/app/scripts/comp/extension/protocol-impl.js
@@ -522,7 +522,7 @@ const ProtocolHandlers = {
         }
 
         const otpPromise = new Promise((resolve, reject) => {
-            selectEntryFieldView.on('result', () => reject(makeError(Errors.userRejected)));
+            selectEntryFieldView?.on('result', () => reject(makeError(Errors.userRejected)));
             entry.otpGenerator.next((err, otp) => {
                 if (otp) {
                     resolve(otp);
@@ -536,9 +536,7 @@ const ProtocolHandlers = {
         try {
             totp = await otpPromise;
         } finally {
-            if (selectEntryFieldView) {
-                selectEntryFieldView.remove();
-            }
+            selectEntryFieldView?.remove();
         }
 
         return encryptResponse(request, {
diff --git a/release-notes.md b/release-notes.md
index 07eae8e1..c6470784 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,5 +1,8 @@
 Release notes
 -------------
+##### v1.18.3 (2021-05-09)
+`-` fix #1804: filling OTP in browser extensions  
+
 ##### v1.18.2 (2021-05-08)
 `-` fix #1802: opening files with saved keyfiles