diff --git a/app/features/build-analyzer/routes/analyzer.tsx b/app/features/build-analyzer/routes/analyzer.tsx
index e6adc40f3..625cc0693 100644
--- a/app/features/build-analyzer/routes/analyzer.tsx
+++ b/app/features/build-analyzer/routes/analyzer.tsx
@@ -176,7 +176,7 @@ export default function BuildAnalyzerPage() {
                     newMainWeaponId: Number(opt.value) as MainWeaponId,
                   })
                 }
-                className="w-full-important"
+                fullWidth
                 clearsInputOnFocus
               />
             </div>
diff --git a/app/features/object-damage-calculator/calculator.css b/app/features/object-damage-calculator/calculator.css
index c860689a3..dc1ab1353 100644
--- a/app/features/object-damage-calculator/calculator.css
+++ b/app/features/object-damage-calculator/calculator.css
@@ -10,6 +10,10 @@
   gap: var(--s-5);
 }
 
+.object-damage__selects__weapon {
+  width: 16rem;
+}
+
 .object-damage__ability {
   position: absolute;
 }
diff --git a/app/features/object-damage-calculator/routes/object-damage-calculator.tsx b/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
index 93b4dcc2f..cb100cd65 100644
--- a/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
+++ b/app/features/object-damage-calculator/routes/object-damage-calculator.tsx
@@ -71,7 +71,7 @@ export default function ObjectDamagePage() {
     <Main className="stack lg">
       <div className="object-damage__controls">
         <div className="object-damage__selects">
-          <div>
+          <div className="object-damage__selects__weapon">
             <Label htmlFor="weapon">{t("analyzer:labels.weapon")}</Label>
             <WeaponCombobox
               id="weapon"
@@ -83,7 +83,7 @@ export default function ObjectDamagePage() {
                   newMainWeaponId: Number(opt.value) as MainWeaponId,
                 })
               }
-              className="w-full-important"
+              fullWidth
               clearsInputOnFocus
             />
           </div>
diff --git a/app/routes/u.$identifier/builds/new.tsx b/app/routes/u.$identifier/builds/new.tsx
index 0688f39ec..68f8d37ad 100644
--- a/app/routes/u.$identifier/builds/new.tsx
+++ b/app/routes/u.$identifier/builds/new.tsx
@@ -188,7 +188,7 @@ export default function NewBuildPage() {
   const { t } = useTranslation();
 
   return (
-    <div className="half-width">
+    <div className="half-width u__build-form">
       <Form className="stack md items-start" method="post">
         {buildToEdit && (
           <input type="hidden" name="buildToEditId" value={buildToEdit.id} />
diff --git a/app/styles/common.css b/app/styles/common.css
index 21439a1ed..92a183478 100644
--- a/app/styles/common.css
+++ b/app/styles/common.css
@@ -166,7 +166,7 @@ textarea:not(.plain, [name="text"]):focus-within {
 }
 
 input:not(.plain, [type="radio"]) {
-  width: 12rem;
+  width: var(--input-width, 12rem);
 }
 
 input:not(.plain) {
@@ -543,7 +543,7 @@ dialog::backdrop {
 }
 
 .combobox-input {
-  width: 12rem;
+  width: var(--input-width, 12rem);
 }
 
 .combobox-input.fullWidth {
@@ -553,7 +553,7 @@ dialog::backdrop {
 .combobox-options {
   position: absolute;
   z-index: 2;
-  width: 12rem;
+  width: var(--input-width, 12rem);
   border-radius: var(--rounded);
   margin-top: var(--s-2);
   background-color: var(--bg-darker);
diff --git a/app/styles/plus.css b/app/styles/plus.css
index bc4beb552..28292f590 100644
--- a/app/styles/plus.css
+++ b/app/styles/plus.css
@@ -83,7 +83,7 @@
 }
 
 .plus__modal-textarea {
-  width: 100%;
+  width: 100% !important;
   resize: none;
 }
 
diff --git a/app/styles/u.css b/app/styles/u.css
index da0d020b7..c3635f960 100644
--- a/app/styles/u.css
+++ b/app/styles/u.css
@@ -226,3 +226,7 @@
   border-radius: 100%;
   background-color: var(--bg-lighter);
 }
+
+.u__build-form {
+  --input-width: min(18rem, 75vw);
+}