diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
     'conpherence.pkg.css' => '2f25eb4f',
     'conpherence.pkg.js' => '020aebcf',
     'core.pkg.css' => 'ac619266',
-    'core.pkg.js' => '2eeda9e0',
+    'core.pkg.js' => 'b3c5c317',
     'dark-console.pkg.js' => '187792c2',
     'differential.pkg.css' => '6d3700f0',
     'differential.pkg.js' => '46fcb3af',
@@ -490,7 +490,7 @@
     'rsrc/js/core/behavior-more.js' => '506aa3f4',
     'rsrc/js/core/behavior-object-selector.js' => '98ef467f',
     'rsrc/js/core/behavior-oncopy.js' => 'da8f5259',
-    'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => '6d347847',
+    'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'daceb29a',
     'rsrc/js/core/behavior-read-only-warning.js' => 'b9109f8f',
     'rsrc/js/core/behavior-redirect.js' => '407ee861',
     'rsrc/js/core/behavior-refresh-csrf.js' => '46116c01',
@@ -654,7 +654,7 @@
     'javelin-behavior-phabricator-notification-example' => '29819b75',
     'javelin-behavior-phabricator-object-selector' => '98ef467f',
     'javelin-behavior-phabricator-oncopy' => 'da8f5259',
-    'javelin-behavior-phabricator-remarkup-assist' => '6d347847',
+    'javelin-behavior-phabricator-remarkup-assist' => 'daceb29a',
     'javelin-behavior-phabricator-reveal-content' => 'b105a3a6',
     'javelin-behavior-phabricator-search-typeahead' => '1cb7d027',
     'javelin-behavior-phabricator-show-older-transactions' => '8b5c7d65',
@@ -1578,18 +1578,6 @@
       'javelin-install',
       'javelin-util',
     ),
-    '6d347847' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'phabricator-phtize',
-      'phabricator-textareautils',
-      'phabricator-remarkup-metadata',
-      'javelin-workflow',
-      'javelin-vector',
-      'phuix-autocomplete',
-      'javelin-mask',
-    ),
     70245195 => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -2115,6 +2103,18 @@
       'javelin-behavior',
       'javelin-dom',
     ),
+    'daceb29a' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'phabricator-phtize',
+      'phabricator-textareautils',
+      'phabricator-remarkup-metadata',
+      'javelin-workflow',
+      'javelin-vector',
+      'phuix-autocomplete',
+      'javelin-mask',
+    ),
     'dae2d55b' => array(
       'javelin-behavior',
       'javelin-uri',
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':
+        // Deactivate full-screen to avoid popup visibility problems.
+        set_edit_mode(edit_root, 'normal');
+
         new JX.Workflow('/macro/meme/create/')
           .setHandler(function(response) {
             update(
@@ -244,6 +247,9 @@
           .start();
         break;
       case 'fa-cloud-upload':
+        // Deactivate full-screen to avoid popup visibility problems.
+        set_edit_mode(edit_root, 'normal');
+
         new JX.Workflow('/file/uploaddialog/')
           .setHandler(function(response) {
             var files = response.files;