diff --git a/app/Ninja/Presenters/PaymentPresenter.php b/app/Ninja/Presenters/PaymentPresenter.php
index 8d91a4827db8..3c8be72da282 100644
--- a/app/Ninja/Presenters/PaymentPresenter.php
+++ b/app/Ninja/Presenters/PaymentPresenter.php
@@ -4,6 +4,11 @@ use Utils;
 
 class PaymentPresenter extends EntityPresenter {
 
+    public function amount()
+    {
+        return Utils::formatMoney($this->entity->amount, $this->entity->client->currency_id);
+    }
+
     public function client()
     {
         return $this->entity->client ? $this->entity->client->getDisplayName() : '';
diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php
index 9a0f10912714..d476bab5279c 100644
--- a/resources/views/payments/edit.blade.php
+++ b/resources/views/payments/edit.blade.php
@@ -38,7 +38,11 @@
             <div class="panel panel-default">
             <div class="panel-body">
 
-            @if (!$payment)
+            @if ($payment)
+             {!! Former::plaintext()->label('client')->value($payment->client->getDisplayName()) !!}
+             {!! Former::plaintext()->label('invoice')->value($payment->invoice->getDisplayName()) !!}
+             {!! Former::plaintext()->label('amount')->value($payment->present()->amount) !!}
+            @else
 			 {!! Former::select('client')->addOption('', '')->addGroupClass('client-select') !!}
 			 {!! Former::select('invoice')->addOption('', '')->addGroupClass('invoice-select') !!}
 			 {!! Former::text('amount') !!}