diff --git a/lib/pages_desktop_specific/desktop_exchange/exchange_steps/subwidgets/desktop_step_2.dart b/lib/pages_desktop_specific/desktop_exchange/exchange_steps/subwidgets/desktop_step_2.dart
index 094ee452d..a7f76c7e8 100644
--- a/lib/pages_desktop_specific/desktop_exchange/exchange_steps/subwidgets/desktop_step_2.dart
+++ b/lib/pages_desktop_specific/desktop_exchange/exchange_steps/subwidgets/desktop_step_2.dart
@@ -357,6 +357,8 @@ class _DesktopStep2State extends ConsumerState<DesktopStep2> {
             focusNode: _toFocusNode,
             style: STextStyles.field(context),
             onChanged: (value) {
+              ref.read(desktopExchangeModelProvider)!.recipientAddress =
+                  _toController.text;
               widget.enableNextChanged.call(
                 _next(),
               );
@@ -504,6 +506,8 @@ class _DesktopStep2State extends ConsumerState<DesktopStep2> {
               focusNode: _refundFocusNode,
               style: STextStyles.field(context),
               onChanged: (value) {
+                ref.read(desktopExchangeModelProvider)!.refundAddress =
+                    _refundController.text;
                 widget.enableNextChanged.call(
                   _next(),
                 );