diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
index fdc793dd..fe362a9b 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/Sender/CreateEnvelopeWizardPopup.razor
@@ -296,8 +296,8 @@
                                                         var rowIndex = i;
                                                         var receiver = _receivers[rowIndex];
 
-                                                        <div class="sender-create-wizard__receiver-item" role="row">
-                                                            <div class="sender-create-wizard__form-grid sender-create-wizard__field--full sender-create-wizard__receiver-item-fields">
+                                                        <div class="sender-create-wizard__receiver-row" role="row">
+                                                            <div class="sender-create-wizard__receiver-fields-stack sender-create-wizard__field--full">
                                                                 <div class="sender-create-wizard__field">
                                                                     <DxTextBox Text="@receiver.FullName"
                                                                                TextChanged="@(value => OnReceiverListNameChanged(rowIndex, value))"
@@ -329,8 +329,8 @@
                                                         </div>
                                                     }
 
-                                                    <div class="sender-create-wizard__receiver-item sender-create-wizard__receiver-item--new" role="row">
-                                                        <div class="sender-create-wizard__form-grid sender-create-wizard__field--full sender-create-wizard__receiver-item-fields">
+                                                    <div class="sender-create-wizard__receiver-row" role="row">
+                                                        <div class="sender-create-wizard__receiver-fields-stack sender-create-wizard__field--full">
                                                             <div class="sender-create-wizard__field">
                                                                 <DxTextBox Text="@_receiverName"
                                                                            TextChanged="OnReceiverNameChanged"
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/wwwroot/css/sender-page.css b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/wwwroot/css/sender-page.css
index 097e914e..3e413926 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/wwwroot/css/sender-page.css
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/wwwroot/css/sender-page.css
@@ -1502,6 +1502,20 @@
     gap: 0.5rem;
 }
 
+.sender-create-wizard__receiver-row {
+    display: flex;
+    align-items: flex-start;
+    gap: 0.55rem;
+}
+
+.sender-create-wizard__receiver-fields-stack {
+    flex: 1 1 auto;
+    min-width: 0;
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 0.35rem;
+}
+
 .sender-create-wizard__receiver-item {
     display: flex;
     align-items: center;
@@ -1757,6 +1771,15 @@
         align-items: flex-start;
     }
 
+    .sender-create-wizard__receiver-row {
+        flex-direction: column;
+        align-items: stretch;
+    }
+
+    .sender-create-wizard__receiver-fields-stack {
+        grid-template-columns: 1fr;
+    }
+
     .sender-create-wizard__receiver-remove {
         width: 100%;
     }