diff --git a/lib/redux/payment/payment_reducer.dart b/lib/redux/payment/payment_reducer.dart
index 8200efdbc..e0b62419c 100644
--- a/lib/redux/payment/payment_reducer.dart
+++ b/lib/redux/payment/payment_reducer.dart
@@ -34,6 +34,7 @@ final editingReducer = combineReducers<PaymentEntity>([
     return action.payments[0];
   }),
   TypedReducer<PaymentEntity, EditPayment>(_updateEditing),
+  TypedReducer<PaymentEntity, RefundPayment>(_updateEditing),
   TypedReducer<PaymentEntity, UpdatePayment>((payment, action) {
     return action.payment.rebuild((b) => b..isChanged = true);
   }),
diff --git a/lib/redux/ui/ui_state.dart b/lib/redux/ui/ui_state.dart
index e2be1b716..cfcaaf3fa 100644
--- a/lib/redux/ui/ui_state.dart
+++ b/lib/redux/ui/ui_state.dart
@@ -122,7 +122,8 @@ abstract class UIState implements Built<UIState, UIStateBuilder> {
     return parts.length > 1 ? parts[1] : '';
   }
 
-  bool get isEditing => currentRoute.endsWith('edit');
+  bool get isEditing =>
+      currentRoute.endsWith('edit') || currentRoute.endsWith('refund');
 
   bool get isInSettings => currentRoute.contains('settings');
 }
diff --git a/lib/ui/payment/refund/payment_refund.dart b/lib/ui/payment/refund/payment_refund.dart
index 49a6d2aab..4bebf3ef8 100644
--- a/lib/ui/payment/refund/payment_refund.dart
+++ b/lib/ui/payment/refund/payment_refund.dart
@@ -5,12 +5,9 @@ import 'package:invoiceninja_flutter/data/models/entities.dart';
 import 'package:invoiceninja_flutter/data/models/invoice_model.dart';
 import 'package:invoiceninja_flutter/data/models/payment_model.dart';
 import 'package:invoiceninja_flutter/redux/invoice/invoice_selectors.dart';
-import 'package:invoiceninja_flutter/redux/client/client_selectors.dart';
-import 'package:invoiceninja_flutter/redux/static/static_selectors.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
-import 'package:invoiceninja_flutter/ui/payment/edit/payment_edit_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/edit_scaffold.dart';
 import 'package:invoiceninja_flutter/ui/payment/refund/payment_refund_vm.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
@@ -113,21 +110,24 @@ class _PaymentRefundState extends State<PaymentRefund> {
           children: <Widget>[
             FormCard(
               children: <Widget>[
-                DecoratedFormField(
-                  controller: _amountController,
-                  autocorrect: false,
-                  keyboardType: TextInputType.numberWithOptions(decimal: true),
-                  label: localization.amount,
-                ),
-                for (var index = 0; index < paymentables.length; index++)
-                  PaymentableEditor(
-                    key: ValueKey(
-                        '__paymentable_${index}_${paymentables[index].id}__'),
-                    viewModel: viewModel,
-                    paymentable: paymentables[index],
-                    index: index,
-                    onChanged: () {},
+                if (payment.paymentables.isEmpty)
+                  DecoratedFormField(
+                    controller: _amountController,
+                    autocorrect: false,
+                    keyboardType:
+                        TextInputType.numberWithOptions(decimal: true),
+                    label: localization.amount,
                   ),
+                if (payment.paymentables.isNotEmpty)
+                  for (var index = 0; index < paymentables.length; index++)
+                    PaymentableEditor(
+                      key: ValueKey(
+                          '__paymentable_${index}_${paymentables[index].id}__'),
+                      viewModel: viewModel,
+                      paymentable: paymentables[index],
+                      index: index,
+                      onChanged: () {},
+                    ),
                 DatePicker(
                   validator: (String val) => val.trim().isEmpty
                       ? AppLocalization.of(context).pleaseSelectADate
@@ -141,17 +141,15 @@ class _PaymentRefundState extends State<PaymentRefund> {
                 ),
               ],
             ),
-            payment.isNew
-                ? FormCard(children: <Widget>[
-                    SwitchListTile(
-                      activeColor: Theme.of(context).accentColor,
-                      title: Text(localization.sendEmail),
-                      value: viewModel.prefState.emailPayment,
-                      subtitle: Text(localization.emailReceipt),
-                      onChanged: (value) => viewModel.onEmailChanged(value),
-                    ),
-                  ])
-                : Container(),
+            FormCard(children: <Widget>[
+              SwitchListTile(
+                activeColor: Theme.of(context).accentColor,
+                title: Text(localization.sendEmail),
+                value: viewModel.prefState.emailPayment,
+                subtitle: Text(localization.emailReceipt),
+                onChanged: (value) => viewModel.onEmailChanged(value),
+              ),
+            ]),
           ],
         ),
       ),