diff --git a/webroot/js/components/chat/username.js b/webroot/js/components/chat/username.js
index 9694aeae1..e0fad94ab 100644
--- a/webroot/js/components/chat/username.js
+++ b/webroot/js/components/chat/username.js
@@ -76,25 +76,23 @@ export default class UsernameForm extends Component {
     const { username } = props;
     const { displayForm } = state;
 
-    const narrowSpace = document.body.clientWidth < 640;
-    const formDisplayStyle = narrowSpace ? 'inline-block' : 'flex';
     const styles = {
       info: {
         display: displayForm ? 'none' : 'flex',
       },
       form: {
-        display: displayForm ? formDisplayStyle : 'none',
+        display: displayForm ? 'flex' : 'none',
       },
     };
 
     return (
       html`
-        <div id="user-info">
+        <div id="user-info" class="whitespace-nowrap">
           <div id="user-info-display" style=${styles.info} title="Click to update user name" class="flex flex-row justify-end items-center cursor-pointer py-2 px-4 overflow-hidden w-full opacity-1 transition-opacity duration-200 hover:opacity-75" onClick=${this.handleDisplayForm}>
             <span id="username-display" class="text-indigo-600 text-xs font-semibold truncate overflow-hidden whitespace-no-wrap">${username}</span>
           </div>
 
-          <div id="user-info-change" class="flex flex-no-wrap p-1 items-center justify-end" style=${styles.form}>
+          <div id="user-info-change" class="flex flex-row flex-no-wrap p-1 items-center justify-end" style=${styles.form}>
             <input type="text"
               id="username-change-input"
               class="appearance-none block w-full bg-gray-200 text-gray-700 border border-black-500 rounded py-1 px-1 leading-tight text-xs focus:bg-white"
diff --git a/webroot/styles/app.css b/webroot/styles/app.css
index 8030c5c64..b5e23888e 100644
--- a/webroot/styles/app.css
+++ b/webroot/styles/app.css
@@ -67,7 +67,6 @@ header {
   min-width: 3rem;
 }
 
-
 #user-info-change {
   display: none;
 }