diff --git a/js/src/forum/components/Composer.js b/js/src/forum/components/Composer.js
index 97a06171a..186be935a 100644
--- a/js/src/forum/components/Composer.js
+++ b/js/src/forum/components/Composer.js
@@ -199,7 +199,7 @@ export default class Composer extends Component {
    */
   animatePositionChange() {
     // When exiting full-screen mode: focus content
-    if (this.prevPosition === ComposerState.Position.FULLSCREEN) {
+    if (this.prevPosition === ComposerState.Position.FULLSCREEN && this.state.position === ComposerState.Position.NORMAL) {
       this.focus();
       return;
     }