diff --git a/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js b/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js
--- a/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js
+++ b/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js
@@ -233,6 +233,9 @@
         update(area, table_prefix + '| ', sel || pht('data'), ' |');
         break;
       case 'fa-meh-o':
+        if (edit_mode == 'fullscreen') {
+          set_edit_mode(root, 'normal');
+        }
         new JX.Workflow('/macro/meme/create/')
           .setHandler(function(response) {
             update(
@@ -244,6 +247,9 @@
           .start();
         break;
       case 'fa-cloud-upload':
+        if (edit_mode == 'fullscreen') {
+          set_edit_mode(root, 'normal');
+        }
         new JX.Workflow('/file/uploaddialog/')
           .setHandler(function(response) {
             var files = response.files;