diff --git a/src/ui/dialog/export-batch.cpp b/src/ui/dialog/export-batch.cpp
index eef2fda72c26d48e5f610d9057e46f8977425b4a..8ba8d2c0b7c51fa4eefdb714b6c8a1d66a8b4df6 100644
--- a/src/ui/dialog/export-batch.cpp
+++ b/src/ui/dialog/export-batch.cpp
@@ -67,7 +67,7 @@ public:
     SPPage *getPage() { return _page; }
     bool isActive() { return _selector.get_active(); }
     void refresh(bool hide, guint32 bg_color);
-    void refreshHide(const std::vector<SPItem *> *list) { _preview.refreshHide(list); }
+    void refreshHide(const std::vector<SPItem *> &list) { _preview.refreshHide(list); }
     void setDocument(SPDocument *doc) { _preview.setDocument(doc); }
 
 private:
@@ -408,16 +408,16 @@ void BatchExport::refreshPreview()
 
     for (auto &[key, val] : current_items) {
         if (preview) {
-            if (!hide) {
-                val->refreshHide(nullptr);
-            } else if (auto item = val->getItem()) {
-                std::vector<SPItem *> selected = {item};
-                val->refreshHide(&selected);
-            } else if (val->getPage()) {
-                auto sels = _desktop->getSelection()->items();
-                std::vector<SPItem *> selected(sels.begin(), sels.end());
-                val->refreshHide(&selected);
+            std::vector<SPItem *> selected;
+            if (hide) {
+                if (auto item = val->getItem()) {
+                    selected = std::vector<SPItem *>({item});
+                } else if (val->getPage()) {
+                    auto sels = _desktop->getSelection()->items();
+                    selected = std::vector<SPItem *>(sels.begin(), sels.end());
+                }
             }
+            val->refreshHide(selected);
         }
         val->refresh(!preview, _bgnd_color_picker->get_current_color());
     }
diff --git a/src/ui/dialog/export-single.cpp b/src/ui/dialog/export-single.cpp
index 8a1ef9ea3d255f8829cceb8ea03a2c54406f6c3f..63819caa0d697a81250caa4432c6acff554bbc39 100644
--- a/src/ui/dialog/export-single.cpp
+++ b/src/ui/dialog/export-single.cpp
@@ -138,10 +138,8 @@ void SingleExport::selectionModified(Inkscape::Selection *selection, guint flags
     if (!(flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_PARENT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
         return;
     }
-    if (!_document) {
-        refreshArea();
-        loadExportHints();
-    }
+    refreshArea();
+    // Do not load export hits for modifications
 }
 
 void SingleExport::selectionChanged(Inkscape::Selection *selection)
@@ -951,8 +949,11 @@ void SingleExport::refreshPreview()
         return;
     }
 
-    std::vector<SPItem *> selected(_desktop->getSelection()->items().begin(), _desktop->getSelection()->items().end());
-    bool hide = si_hide_all->get_active();
+    std::vector<SPItem *> selected;
+    if (si_hide_all->get_active()) {
+        // This is because selection items is not a std::vector yet. FIXME.
+        selected = std::vector<SPItem *>(_desktop->getSelection()->items().begin(), _desktop->getSelection()->items().end());
+    }
 
     Unit const *unit = units->getUnit();
     float x0 = unit->convert(spin_buttons[SPIN_X0]->get_value(), "px");
@@ -961,7 +962,7 @@ void SingleExport::refreshPreview()
     float y1 = unit->convert(spin_buttons[SPIN_Y1]->get_value(), "px");
     preview->setDbox(x0, x1, y0, y1);
     preview->set_background_color(_bgnd_color_picker->get_current_color());
-    preview->refreshHide(hide ? &selected : nullptr);
+    preview->refreshHide(selected);
     preview->queueRefresh();
 }
 
diff --git a/src/ui/widget/export-preview.cpp b/src/ui/widget/export-preview.cpp
index 6f01bcc1e7acdeea3cf9f38f0bb4a9888de002be..bdf60ba275c3cbd9d1767d43ef0458214be42d8a 100644
--- a/src/ui/widget/export-preview.cpp
+++ b/src/ui/widget/export-preview.cpp
@@ -92,7 +92,13 @@ void ExportPreview::setDocument(SPDocument *document)
     }
 }
 
-void ExportPreview::refreshHide(const std::vector<SPItem *> *list)
+void ExportPreview::refreshHide(const std::vector<SPItem *> &list)
+{
+    _hidden_excluded = std::vector<SPItem *>(list.begin(), list.end());
+    _hidden_requested = true;
+}
+
+void ExportPreview::performHide(const std::vector<SPItem *> *list)
 {
     if (_document) {
         if (isLastHide) {
@@ -192,6 +198,10 @@ void ExportPreview::renderPreview()
         return;
     }
 
+    if (_hidden_requested) {
+        this->performHide(&_hidden_excluded);
+        _hidden_requested = false;
+    }
     if (_document) {
         GdkPixbuf *pb = nullptr;
         if (_item) {
diff --git a/src/ui/widget/export-preview.h b/src/ui/widget/export-preview.h
index 54d58c045c26cb9ae989459fd2e32436622e9c0f..2aa651b54925c0c15b7c16a1f32c9a3bf082c659 100644
--- a/src/ui/widget/export-preview.h
+++ b/src/ui/widget/export-preview.h
@@ -16,6 +16,8 @@
 #include "document.h"
 
 class SPObject;
+class SPItem;
+
 namespace Glib {
 class Timer;
 }
@@ -47,9 +49,11 @@ private:
     gdouble minDelay = 0.1;
     guint32 _bg_color = 0;
 
+    std::vector<SPItem *> _hidden_excluded;
+    bool _hidden_requested = false;
 public:
     void setDocument(SPDocument *document);
-    void refreshHide(const std::vector<SPItem *> *list);
+    void refreshHide(const std::vector<SPItem *> &list = {});
     void hide_other_items_recursively(SPObject *o, const std::vector<SPItem *> &list);
     void setItem(SPItem *item);
     void setDbox(double x0, double x1, double y0, double y1);
@@ -67,6 +71,7 @@ private:
     void refreshPreview();
     void renderPreview();
     bool refreshCB();
+    void performHide(const std::vector<SPItem *> *list);
 };
 } // namespace Dialog
 } // namespace UI