diff --git a/app/soapbox/components/emoji-button-wrapper.tsx b/app/soapbox/components/emoji-button-wrapper.tsx
index 32159b329..1dad15dc7 100644
--- a/app/soapbox/components/emoji-button-wrapper.tsx
+++ b/app/soapbox/components/emoji-button-wrapper.tsx
@@ -44,13 +44,19 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
   if (!status) return null;
 
   const handleMouseEnter = () => {
-    setVisible(true);
+    if (!isUserTouching()) {
+      setVisible(true);
+    }
   };
 
   const handleMouseLeave = () => {
     setVisible(false);
   };
 
+  const handleUnfocus = () => {
+    setVisible(false);
+  };
+
   const handleReact = (emoji: string): void => {
     if (ownAccount) {
       dispatch(simpleEmojiReact(status, emoji));
@@ -77,6 +83,7 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
       handleReact(meEmojiReact);
     }
 
+    e.preventDefault();
     e.stopPropagation();
   };
 
@@ -106,6 +113,7 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
     <div onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
       {React.cloneElement(children, {
         onClick: handleClick,
+        onBlur: handleUnfocus,
         ref,
       })}
 
diff --git a/app/soapbox/components/timeline_queue_button_header.js b/app/soapbox/components/timeline_queue_button_header.js
index 99f764e22..29a8e787a 100644
--- a/app/soapbox/components/timeline_queue_button_header.js
+++ b/app/soapbox/components/timeline_queue_button_header.js
@@ -103,7 +103,7 @@ class TimelineQueueButtonHeader extends React.PureComponent {
 
     return (
       <div className={classes}>
-        <a className='flex items-center bg-primary-600 hover:bg-primary-700 hover:scale-105 active:scale-100 transition-transform text-white rounded-full px-4 py-2 space-x-1.5 cursor-pointer' onClick={this.handleClick}>
+        <a className='flex items-center bg-primary-600 hover:bg-primary-700 hover:scale-105 active:scale-100 transition-transform text-white rounded-full px-4 py-2 space-x-1.5 cursor-pointer whitespace-nowrap' onClick={this.handleClick}>
           <Icon src={require('@tabler/icons/icons/arrow-bar-to-up.svg')} />
 
           {(count > 0) && (
diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js
index 675abe4bf..2f054836f 100644
--- a/app/soapbox/features/compose/components/compose_form.js
+++ b/app/soapbox/features/compose/components/compose_form.js
@@ -364,7 +364,7 @@ class ComposeForm extends ImmutablePureComponent {
         <QuotedStatusContainer />
 
         <div
-          className={classNames('flex items-center justify-between', {
+          className={classNames('flex flex-wrap items-center justify-between', {
             'hidden': condensed,
           })}
         >
@@ -378,7 +378,7 @@ class ComposeForm extends ImmutablePureComponent {
             <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
           </div>
 
-          <div className='flex items-center space-x-4 ml-4'>
+          <div className='flex items-center space-x-4 ml-auto'>
             {maxTootChars && (
               <div className='flex items-center space-x-1'>
                 <TextCharacterCounter max={maxTootChars} text={text} />