diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 2cd43de07..72e6832c0 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -231,10 +231,10 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
             }
         }
         if(imgsrc->getSensorType() == ST_BAYER) {
-            if(params.raw.bayersensor.method!= RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
+            if(params.raw.bayersensor.method != RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
                 imgsrc->setBorder(params.raw.bayersensor.border);
             } else {
-                imgsrc->setBorder(4);
+                imgsrc->setBorder(std::max(params.raw.bayersensor.border, 1));
             }
         }
         bool autoContrast = false;
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index ac134f98d..718c9c88c 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -163,7 +163,7 @@ private:
             if(params.raw.bayersensor.method!= RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
                 imgsrc->setBorder(params.raw.bayersensor.border);
             } else {
-                imgsrc->setBorder(4);
+                imgsrc->setBorder(std::max(params.raw.bayersensor.border, 1));
             }
         }
         imgsrc->getFullSize (fw, fh, tr);
diff --git a/rtgui/bayerprocess.cc b/rtgui/bayerprocess.cc
index dc211995e..1770dcbb0 100644
--- a/rtgui/bayerprocess.cc
+++ b/rtgui/bayerprocess.cc
@@ -353,11 +353,9 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
                                          || pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCBVNG4)
                                          || pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::RCDVNG4));
         if (pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::PIXELSHIFT)) {
-            borderbox->hide();
             pixelShiftOptions->set_visible(pp->raw.bayersensor.pixelShiftMotionCorrectionMethod == RAWParams::BayerSensor::PSMotionCorrectionMethod::CUSTOM);
             pixelShiftFrame->show();
         } else {
-            borderbox->show();
             pixelShiftFrame->hide();
         }
 
@@ -566,7 +564,6 @@ void BayerProcess::methodChanged ()
         }
 
         if (currentMethod == procparams::RAWParams::BayerSensor::Method::PIXELSHIFT) {
-            borderbox->hide();
             if(pixelShiftMotionMethod->get_active_row_number() == 2) {
                 pixelShiftOptions->show();
             } else {
@@ -574,7 +571,6 @@ void BayerProcess::methodChanged ()
             }
             pixelShiftFrame->show();
         } else {
-            borderbox->show();
             pixelShiftFrame->hide();
         }
     }