diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index 592c4c97e..360aca7a0 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -271,7 +271,7 @@ const ToolPanelCoordinator::ToolLayout PANEL_TOOLS = {
 
 std::unordered_map<std::string, Tool> ToolPanelCoordinator::toolNamesReverseMap;
 
-ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favoritePanelSW(nullptr), hasChanged (false), editDataProvider (nullptr), photoLoadedOnce(false)
+ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favoritePanelSW(nullptr), hasChanged (false), batch(batch), editDataProvider (nullptr), photoLoadedOnce(false)
 {
 
     favoritePanel   = Gtk::manage (new ToolVBox ());
@@ -812,8 +812,9 @@ ToolPanelCoordinator::updateToolPanel(
     // if they are sub-tools within the favorites panel, or if tool cloning is
     // off and they are not within the favorites panel.
     const auto should_skip_tool =
-        [skip_favorites, &favorites](const ToolTree &tool_tree) {
-            return skip_favorites && favorites.count(tool_tree.id);
+        [this, skip_favorites, &favorites](const ToolTree &tool_tree) {
+            return (skip_favorites && favorites.count(tool_tree.id)) ||
+                   (batch && tool_tree.id == Tool::LOCALLAB);
         };
 
     // Keep tools that are already correct.
diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h
index cd354738e..fda89ef37 100644
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -212,6 +212,7 @@ protected:
     std::vector<MyExpander*> expList;
 
     bool hasChanged;
+    bool batch;
 
     void addPanel(Gtk::Box* where, FoldableToolPanel* panel, int level = 1);
     void foldThemAll(GdkEventButton* event);