diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index 36c25d78dd..03ae26b922 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -230,7 +230,7 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   handleExpirationPick = (data) => {
-    const position     = this.autosuggestTextarea.textarea.selectionStart;
+    const position     = this.textareaRef.current.selectionStart;
 
     this.props.onPickExpiration(position, data);
   };
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index dc34e7f1af..0b52bbd0a6 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -251,7 +251,7 @@ const insertExpiration = (state, position, data) => {
   return state.merge({
     text: `${oldText.slice(0, position)} ${data} ${oldText.slice(position)}`,
     focusDate: new Date(),
-    caretPosition: position + data.length + 1,
+    caretPosition: position + data.length + 2,
     idempotencyKey: uuid(),
   });
 };