diff --git a/lib/screens/channel/chat/chat.dart b/lib/screens/channel/chat/chat.dart
index c869e0ac..c5f2ef43 100644
--- a/lib/screens/channel/chat/chat.dart
+++ b/lib/screens/channel/chat/chat.dart
@@ -32,6 +32,7 @@ class Chat extends StatelessWidget {
                       style: DefaultTextStyle.of(context).style.copyWith(fontSize: chatStore.settings.fontSize),
                       child: Observer(
                         builder: (context) => ListView.separated(
+                          padding: const EdgeInsets.symmetric(vertical: 5.0),
                           addAutomaticKeepAlives: false,
                           addRepaintBoundaries: false,
                           itemCount: chatStore.messages.length,
@@ -94,7 +95,6 @@ class Chat extends StatelessWidget {
               ],
             ),
           ),
-          const SizedBox(height: 5.0),
           ChatBottomBar(chatStore: chatStore),
           if (chatStore.assetsStore.showEmoteMenu)
             SizedBox(
diff --git a/lib/screens/channel/chat/widgets/chat_bottom_bar.dart b/lib/screens/channel/chat/widgets/chat_bottom_bar.dart
index 1c358f8f..12ee3a26 100644
--- a/lib/screens/channel/chat/widgets/chat_bottom_bar.dart
+++ b/lib/screens/channel/chat/widgets/chat_bottom_bar.dart
@@ -51,6 +51,7 @@ class ChatBottomBar extends StatelessWidget {
                   },
                 ),
                 isDense: true,
+                hintMaxLines: 1,
                 contentPadding: const EdgeInsets.all(10.0),
                 border: const OutlineInputBorder(
                   borderRadius: BorderRadius.all(Radius.circular(10.0)),
diff --git a/lib/screens/channel/chat/widgets/chat_user_modal.dart b/lib/screens/channel/chat/widgets/chat_user_modal.dart
index 61c42274..9bc21b0b 100644
--- a/lib/screens/channel/chat/widgets/chat_user_modal.dart
+++ b/lib/screens/channel/chat/widgets/chat_user_modal.dart
@@ -75,6 +75,7 @@ class ChatUserModal extends StatelessWidget {
               child: MediaQuery(
                 data: MediaQuery.of(context).copyWith(textScaleFactor: chatStore.settings.messageScale),
                 child: ListView.separated(
+                  padding: const EdgeInsets.symmetric(vertical: 5.0),
                   reverse: true,
                   itemBuilder: (context, index) => InkWell(
                     onLongPress: () async {