diff --git a/commet/lib/ui/molecules/message_input.dart b/commet/lib/ui/molecules/message_input.dart
index 12900c291..40c951020 100644
--- a/commet/lib/ui/molecules/message_input.dart
+++ b/commet/lib/ui/molecules/message_input.dart
@@ -584,7 +584,7 @@ class MessageInputState extends State<MessageInput> {
             style: Theme.of(context).textTheme.bodyMedium!,
             maxLines: null,
             contextMenuBuilder: contextMenuBuilder,
-            keyboardType: TextInputType.text,
+            keyboardType: TextInputType.multiline,
             textCapitalization: TextCapitalization.sentences,
             decoration: InputDecoration(
                 contentPadding:
diff --git a/commet/lib/ui/pages/login/login_page_view.dart b/commet/lib/ui/pages/login/login_page_view.dart
index 673ead28c..99ba3d766 100644
--- a/commet/lib/ui/pages/login/login_page_view.dart
+++ b/commet/lib/ui/pages/login/login_page_view.dart
@@ -362,6 +362,7 @@ class _LoginPageViewState extends State<LoginPageView> {
       controller: _homeserverTextField,
       readOnly: widget.isLoggingIn,
       onChanged: widget.updateHomeserver,
+      keyboardType: TextInputType.url,
       inputFormatters: [FilteringTextInputFormatter.deny(RegExp("[ ]"))],
       decoration: InputDecoration(
           prefixText: 'https://',