diff --git a/stylesheets/components/StoryViewsNRepliesModal.scss b/stylesheets/components/StoryViewsNRepliesModal.scss
index e8469434bcfb..04bcae3f26d4 100644
--- a/stylesheets/components/StoryViewsNRepliesModal.scss
+++ b/stylesheets/components/StoryViewsNRepliesModal.scss
@@ -45,7 +45,7 @@
 
   &__emoji-button {
     height: 24px;
-    margin-right: 8px;
+    margin-left: 10px;
     width: 24px;
 
     &::after {
@@ -78,9 +78,12 @@
         color: $color-gray-25;
       }
 
+      display: flex;
+      align-items: center;
+      min-height: 36px;
+
       &--with-children {
-        align-items: center;
-        display: flex;
+        flex: 1;
       }
 
       .quill {
diff --git a/ts/components/CompositionInput.tsx b/ts/components/CompositionInput.tsx
index 505d6efe64dd..4dea728cc57f 100644
--- a/ts/components/CompositionInput.tsx
+++ b/ts/components/CompositionInput.tsx
@@ -62,19 +62,19 @@ export type InputApi = {
   submit: () => void;
 };
 
-export type Props = {
+export type Props = Readonly<{
   children?: React.ReactNode;
-  readonly i18n: LocalizerType;
-  readonly disabled?: boolean;
-  readonly getPreferredBadge: PreferredBadgeSelectorType;
-  readonly large?: boolean;
-  readonly inputApi?: React.MutableRefObject<InputApi | undefined>;
-  readonly skinTone?: EmojiPickDataType['skinTone'];
-  readonly draftText?: string;
-  readonly draftBodyRanges?: Array<BodyRangeType>;
-  readonly moduleClassName?: string;
-  readonly theme: ThemeType;
-  readonly placeholder?: string;
+  i18n: LocalizerType;
+  disabled?: boolean;
+  getPreferredBadge: PreferredBadgeSelectorType;
+  large?: boolean;
+  inputApi?: React.MutableRefObject<InputApi | undefined>;
+  skinTone?: EmojiPickDataType['skinTone'];
+  draftText?: string;
+  draftBodyRanges?: Array<BodyRangeType>;
+  moduleClassName?: string;
+  theme: ThemeType;
+  placeholder?: string;
   sortedGroupMembers?: Array<ConversationType>;
   scrollerRef?: React.RefObject<HTMLDivElement>;
   onDirtyChange?(dirty: boolean): unknown;
@@ -93,7 +93,7 @@ export type Props = {
   onScroll?: (ev: React.UIEvent<HTMLElement>) => void;
   getQuotedMessage?(): unknown;
   clearQuotedMessage?(): unknown;
-};
+}>;
 
 const MAX_LENGTH = 64 * 1024;
 const BASE_CLASS_NAME = 'module-composition-input';
@@ -671,6 +671,7 @@ export function CompositionInput(props: Props): React.ReactElement {
       <Reference>
         {({ ref }) => (
           <div className={getClassName('__input')} ref={ref}>
+            {children}
             <div
               ref={
                 props.scrollerRef
@@ -685,7 +686,6 @@ export function CompositionInput(props: Props): React.ReactElement {
                 children ? getClassName('__input--with-children') : null
               )}
             >
-              {children}
               {reactQuill}
               {emojiCompletionElement}
               {mentionCompletionElement}