diff --git a/core/modules/quickedit/js/views/EntityToolbarView.es6.js b/core/modules/quickedit/js/views/EntityToolbarView.es6.js
index 9bc2d9c8852ab7ccf1f71cddb26db5eec07eb30b..eece46b5a11e853e5444f87d5c1db589a76d87f6 100644
--- a/core/modules/quickedit/js/views/EntityToolbarView.es6.js
+++ b/core/modules/quickedit/js/views/EntityToolbarView.es6.js
@@ -299,9 +299,9 @@
         function refinePopper(data) {
           // Determine if the pointer should be on the top or bottom.
           const isBelow = data.offsets.popper.top > data.offsets.reference.top;
-          data.instance.popper.classList.toggle(
+          const classListMethod = isBelow ? 'add' : 'remove';
+          data.instance.popper.classList[classListMethod](
             'quickedit-toolbar-pointer-top',
-            isBelow,
           );
           // Don't position the toolbar past the first or last editable field if
           // the entity is the target.
diff --git a/core/modules/quickedit/js/views/EntityToolbarView.js b/core/modules/quickedit/js/views/EntityToolbarView.js
index 147990fcb7be409834ce9624fa9d9c6d668bc7d9..30dd7fa2daf9cec74a376a8e15d8d299c23d7b26 100644
--- a/core/modules/quickedit/js/views/EntityToolbarView.js
+++ b/core/modules/quickedit/js/views/EntityToolbarView.js
@@ -165,7 +165,8 @@
 
       function refinePopper(data) {
         var isBelow = data.offsets.popper.top > data.offsets.reference.top;
-        data.instance.popper.classList.toggle('quickedit-toolbar-pointer-top', isBelow);
+        var classListMethod = isBelow ? 'add' : 'remove';
+        data.instance.popper.classList[classListMethod]('quickedit-toolbar-pointer-top');
 
         if (that.$entity[0] === data.instance.reference) {
           var $field = that.$entity.find('.quickedit-editable').eq(isBelow ? -1 : 0);