diff --git a/res/css/views/dialogs/_DevtoolsDialog.scss b/res/css/views/dialogs/_DevtoolsDialog.scss
index 2f01f3ecc6..1f5d36b57a 100644
--- a/res/css/views/dialogs/_DevtoolsDialog.scss
+++ b/res/css/views/dialogs/_DevtoolsDialog.scss
@@ -82,8 +82,13 @@ limitations under the License.
     display: inline-block;
 }
 
-.mx_DevTools_content .mx_Field_input + .mx_Field_input {
-    margin-left: 42px;
+.mx_DevTools_eventTypeStateKeyGroup {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.mx_DevTools_content .mx_Field_input:first-of-type {
+    margin-right: 42px;
 }
 
 .mx_DevTools_tgl {
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index d4a5ec5e74..e1dd8ea620 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -119,7 +119,7 @@ export default class UserProvider extends AutocompleteProvider {
                     component: (
                         <PillCompletion
                             initialComponent={<MemberAvatar member={user} width={24} height={24} />}
-                            title={displayName}
+                            title={displayName}mx_DevTools_content
                             description={user.userId} />
                     ),
                     range,
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
index 0835c41bb9..9327e1e54e 100644
--- a/src/components/views/dialogs/DevtoolsDialog.js
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -128,8 +128,10 @@ class SendCustomEvent extends GenericEditor {
 
         return <div>
             <div className="mx_DevTools_content">
-                { this.textInput('eventType', _t('Event Type')) }
-                { this.state.isStateEvent && this.textInput('stateKey', _t('State Key')) }
+                <div className="mx_DevTools_eventTypeStateKeyGroup">
+                    { this.textInput('eventType', _t('Event Type')) }
+                    { this.state.isStateEvent && this.textInput('stateKey', _t('State Key')) }
+                </div>
 
                 <br />