diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php
index da574536e3..d920b7c19f 100644
--- a/src/applications/macro/controller/PhabricatorMacroEditController.php
+++ b/src/applications/macro/controller/PhabricatorMacroEditController.php
@@ -38,6 +38,7 @@ final class PhabricatorMacroEditController
 
     $errors = array();
     $e_name = true;
+    $file = null;
 
     $request = $this->getRequest();
     $user = $request->getUser();
@@ -75,6 +76,18 @@ final class PhabricatorMacroEditController
           $e_name = 'Duplicate';
         }
       }
+    } else if ($this->id) {
+      $file = id(new PhabricatorFile())
+        ->loadOneWhere('phid = %s', $macro->getFilePHID());
+    }
+
+    $caption = null;
+    if ($file) {
+      $caption = phutil_render_tag(
+        'img',
+        array(
+          'src' => $file->getViewURI(),
+        ));
     }
 
     if ($errors) {
@@ -102,6 +115,7 @@ final class PhabricatorMacroEditController
         id(new AphrontFormFileControl())
           ->setLabel('File')
           ->setName('file')
+          ->setCaption($caption)
           ->setError(true))
       ->appendChild(
         id(new AphrontFormSubmitControl())