diff --git a/NAPS2.Lib/EtoForms/Layout/EtoLayoutExtensions.cs b/NAPS2.Lib/EtoForms/Layout/EtoLayoutExtensions.cs
index e601121a8..4e8285154 100644
--- a/NAPS2.Lib/EtoForms/Layout/EtoLayoutExtensions.cs
+++ b/NAPS2.Lib/EtoForms/Layout/EtoLayoutExtensions.cs
@@ -72,7 +72,7 @@ public static class EtoLayoutExtensions
     public static LayoutControl Visible(this Control control, LayoutVisibility? visibility) =>
         new LayoutControl(control, visibility: visibility);
 
-    public static LayoutControl Wrap(this Label label, int defaultWidth)
+    public static LayoutControl DynamicWrap(this Label label, int defaultWidth)
     {
         if (defaultWidth == 0)
         {
diff --git a/NAPS2.Lib/EtoForms/Ui/EmailSettingsForm.cs b/NAPS2.Lib/EtoForms/Ui/EmailSettingsForm.cs
index a0271dca9..792bfc759 100644
--- a/NAPS2.Lib/EtoForms/Ui/EmailSettingsForm.cs
+++ b/NAPS2.Lib/EtoForms/Ui/EmailSettingsForm.cs
@@ -39,7 +39,7 @@ public class EmailSettingsForm : EtoDialogBase
             L.GroupBox(
                 UiStrings.Provider,
                 L.Row(
-                    _provider.Wrap(EtoPlatform.Current.IsGtk ? 150 : 0).AlignCenter(),
+                    _provider.DynamicWrap(EtoPlatform.Current.IsGtk ? 150 : 0).AlignCenter(),
                     C.Filler(),
                     C.Button(UiStrings.Change, ChangeProvider).AlignCenter().Padding(top: 4, bottom: 4)
                 )
diff --git a/NAPS2.Lib/EtoForms/Ui/ErrorForm.cs b/NAPS2.Lib/EtoForms/Ui/ErrorForm.cs
index 3bed1badf..02fe7e5ab 100644
--- a/NAPS2.Lib/EtoForms/Ui/ErrorForm.cs
+++ b/NAPS2.Lib/EtoForms/Ui/ErrorForm.cs
@@ -25,7 +25,7 @@ public class ErrorForm : EtoDialogBase
         LayoutController.Content = L.Column(
             L.Row(
                 _image.AlignCenter().Padding(right: 5),
-                _message.Wrap(350).NaturalWidth(350).AlignCenter().Scale()
+                _message.DynamicWrap(350).NaturalWidth(350).AlignCenter().Scale()
             ),
             L.Row(
                 C.Link(UiStrings.TechnicalDetails, ToggleDetails).AlignCenter(),
diff --git a/NAPS2.Lib/EtoForms/Ui/ImageSettingsForm.cs b/NAPS2.Lib/EtoForms/Ui/ImageSettingsForm.cs
index b85a0891d..02ac804e7 100644
--- a/NAPS2.Lib/EtoForms/Ui/ImageSettingsForm.cs
+++ b/NAPS2.Lib/EtoForms/Ui/ImageSettingsForm.cs
@@ -43,7 +43,7 @@ public class ImageSettingsForm : EtoDialogBase
                 UiStrings.JpegQuality,
                 L.Column(
                     _jpegQuality.AsControl().SpacingAfter(0),
-                    C.Label(UiStrings.JpegQualityHelp).Wrap(300)
+                    C.Label(UiStrings.JpegQualityHelp).DynamicWrap(300)
                 )
             ),
             L.GroupBox(
diff --git a/NAPS2.Lib/EtoForms/Ui/RecoverForm.cs b/NAPS2.Lib/EtoForms/Ui/RecoverForm.cs
index d8d0030ee..a6c9d3257 100644
--- a/NAPS2.Lib/EtoForms/Ui/RecoverForm.cs
+++ b/NAPS2.Lib/EtoForms/Ui/RecoverForm.cs
@@ -28,7 +28,7 @@ public class RecoverForm : EtoDialogBase
         var notNowButton = C.CancelButton(this, UiStrings.NotNow);
 
         LayoutController.Content = L.Column(
-            _prompt.Wrap(400).MinWidth(300),
+            _prompt.DynamicWrap(400).MinWidth(300),
             C.Filler(),
             L.Row(
                 recoverButton.Scale().Height(32),
diff --git a/NAPS2.Lib/EtoForms/Widgets/PasswordBoxWithToggle.cs b/NAPS2.Lib/EtoForms/Widgets/PasswordBoxWithToggle.cs
index ca6c5b72c..eb13a1782 100644
--- a/NAPS2.Lib/EtoForms/Widgets/PasswordBoxWithToggle.cs
+++ b/NAPS2.Lib/EtoForms/Widgets/PasswordBoxWithToggle.cs
@@ -91,7 +91,7 @@ public class PasswordBoxWithToggle
             return C.Filler();
         }
         var label = C.Label(Title!);
-        return TitleWrapWidth > 0 ? label.Wrap(TitleWrapWidth).Scale() : label.Scale();
+        return TitleWrapWidth > 0 ? label.DynamicWrap(TitleWrapWidth).Scale() : label.Scale();
     }
 
     public event Action? TextChanged;