diff --git a/tgui/packages/tgui/interfaces/AlertModal.js b/tgui/packages/tgui/interfaces/AlertModal.js
index e09991a1b94..b929423495e 100644
--- a/tgui/packages/tgui/interfaces/AlertModal.js
+++ b/tgui/packages/tgui/interfaces/AlertModal.js
@@ -65,11 +65,13 @@ export class AlertModal extends Component {
     const { current } = this.state;
     const focusCurrentButton = () => this.setCurrent(current, false);
 
+    const windowHeight = Math.max(150, message.length);
+
     return (
       <Window
         title={title}
         width={350}
-        height={150}
+        height={windowHeight}
         canClose={timeout > 0}>
         {timeout && <Loader value={timeout} />}
         <Window.Content
diff --git a/tgui/packages/tgui/styles/interfaces/AlertModal.scss b/tgui/packages/tgui/styles/interfaces/AlertModal.scss
index 546082d2dc5..0485e82bf84 100644
--- a/tgui/packages/tgui/styles/interfaces/AlertModal.scss
+++ b/tgui/packages/tgui/styles/interfaces/AlertModal.scss
@@ -8,6 +8,7 @@
 .AlertModal__Message {
   text-align: center;
   justify-content: center;
+  white-space: pre-line;
 }
 
 .AlertModal__Buttons {
diff --git a/tgui/packages/tgui/styles/interfaces/ListInput.scss b/tgui/packages/tgui/styles/interfaces/ListInput.scss
index 1533cf66cb9..f65114e309d 100644
--- a/tgui/packages/tgui/styles/interfaces/ListInput.scss
+++ b/tgui/packages/tgui/styles/interfaces/ListInput.scss
@@ -13,6 +13,7 @@
 
 .ListInput__Section .Section__titleText {
   font-size: base.em(12px);
+  white-space: pre-line;
 }
 
  .ListInput__Loader {