diff --git a/rtengine/capturesharpening.cc b/rtengine/capturesharpening.cc
index 6720d9abc..38fe0897c 100644
--- a/rtengine/capturesharpening.cc
+++ b/rtengine/capturesharpening.cc
@@ -810,6 +810,7 @@ BENCHFUN
     if (plistener) {
         plistener->setProgress(1.0);
     }
+    rgbSourceModified = false;
 }
 
 } /* namespace */
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index 8f635fbf8..ebfa97a96 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -182,7 +182,6 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favorit
     rawPanelSW         = Gtk::manage (new MyScrolledWindow ());
     advancedPanelSW    = Gtk::manage (new MyScrolledWindow ());
     locallabPanelSW     = Gtk::manage(new MyScrolledWindow());    
-    updateVScrollbars (options.hideTPVScrollbar);
 
     // load panel endings
     for (int i = 0; i < 8; i++) {
@@ -198,6 +197,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favorit
         favoritePanel->pack_start(*Gtk::manage(new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
         favoritePanel->pack_start(*vbPanelEnd[0], Gtk::PACK_SHRINK, 4);
     }
+    updateVScrollbars(options.hideTPVScrollbar);
 
     exposurePanelSW->add  (*exposurePanel);
     exposurePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);