diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 12ef0c226..6f0257064 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -251,6 +251,8 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
                 } else {
                     imgsrc->setBorder(std::max(params.raw.bayersensor.border, 2));
                 }
+            } else if (imgsrc->getSensorType() == ST_FUJI_XTRANS) {
+                imgsrc->setBorder(params.raw.xtranssensor.border);
             }
             bool autoContrast = imgsrc->getSensorType() == ST_BAYER ? params.raw.bayersensor.dualDemosaicAutoContrast : params.raw.xtranssensor.dualDemosaicAutoContrast;
             double contrastThreshold = imgsrc->getSensorType() == ST_BAYER ? params.raw.bayersensor.dualDemosaicContrast : params.raw.xtranssensor.dualDemosaicContrast;
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index 33ea7e5cc..3ddf26c4d 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -2609,6 +2609,7 @@ RAWParams::XTransSensor::XTransSensor() :
     method(getMethodString(Method::THREE_PASS)),
     dualDemosaicAutoContrast(true),
     dualDemosaicContrast(20),
+    border(7),
     ccSteps(0),
     blackred(0.0),
     blackgreen(0.0),
@@ -2622,6 +2623,7 @@ bool RAWParams::XTransSensor::operator ==(const XTransSensor& other) const
         method == other.method
         && dualDemosaicAutoContrast == other.dualDemosaicAutoContrast
         && dualDemosaicContrast == other.dualDemosaicContrast
+        && border == other.border
         && ccSteps == other.ccSteps
         && blackred == other.blackred
         && blackgreen == other.blackgreen
@@ -3552,6 +3554,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
         saveToKeyfile(!pedited || pedited->raw.xtranssensor.method, "RAW X-Trans", "Method", raw.xtranssensor.method, keyFile);
         saveToKeyfile(!pedited || pedited->raw.xtranssensor.dualDemosaicAutoContrast, "RAW X-Trans", "DualDemosaicAutoContrast", raw.xtranssensor.dualDemosaicAutoContrast, keyFile);
         saveToKeyfile(!pedited || pedited->raw.xtranssensor.dualDemosaicContrast, "RAW X-Trans", "DualDemosaicContrast", raw.xtranssensor.dualDemosaicContrast, keyFile);
+        saveToKeyfile(!pedited || pedited->raw.xtranssensor.border, "RAW X-Trans", "Border", raw.xtranssensor.border, keyFile);
         saveToKeyfile(!pedited || pedited->raw.xtranssensor.ccSteps, "RAW X-Trans", "CcSteps", raw.xtranssensor.ccSteps, keyFile);
         saveToKeyfile(!pedited || pedited->raw.xtranssensor.exBlackRed, "RAW X-Trans", "PreBlackRed", raw.xtranssensor.blackred, keyFile);
         saveToKeyfile(!pedited || pedited->raw.xtranssensor.exBlackGreen, "RAW X-Trans", "PreBlackGreen", raw.xtranssensor.blackgreen, keyFile);
@@ -5099,6 +5102,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
                 }
             }
             assignFromKeyfile(keyFile, "RAW X-Trans", "DualDemosaicContrast", pedited, raw.xtranssensor.dualDemosaicContrast, pedited->raw.xtranssensor.dualDemosaicContrast);
+            assignFromKeyfile(keyFile, "RAW X-Trans", "Border", pedited, raw.xtranssensor.border, pedited->raw.xtranssensor.border);
             assignFromKeyfile(keyFile, "RAW X-Trans", "CcSteps", pedited, raw.xtranssensor.ccSteps, pedited->raw.xtranssensor.ccSteps);
             assignFromKeyfile(keyFile, "RAW X-Trans", "PreBlackRed", pedited, raw.xtranssensor.blackred, pedited->raw.xtranssensor.exBlackRed);
             assignFromKeyfile(keyFile, "RAW X-Trans", "PreBlackGreen", pedited, raw.xtranssensor.blackgreen, pedited->raw.xtranssensor.exBlackGreen);
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index d79fc5ae4..a359f1d53 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1369,6 +1369,7 @@ struct RAWParams {
         Glib::ustring method;
         bool dualDemosaicAutoContrast;
         double dualDemosaicContrast;
+        int border;
         int ccSteps;
         double blackred;
         double blackgreen;
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index 46f1a91c8..8fa79241b 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -165,6 +165,8 @@ private:
             } else {
                 imgsrc->setBorder(std::max(params.raw.bayersensor.border, 2));
             }
+        } else if (imgsrc->getSensorType() == ST_FUJI_XTRANS) {
+            imgsrc->setBorder(params.raw.xtranssensor.border);
         }
         imgsrc->getFullSize (fw, fh, tr);
 
diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc
index 5d7396f19..992cb5c58 100644
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -432,6 +432,7 @@ void ParamsEdited::set(bool v)
     raw.xtranssensor.method = v;
     raw.xtranssensor.dualDemosaicAutoContrast = v;
     raw.xtranssensor.dualDemosaicContrast = v;
+    raw.xtranssensor.border = v;
     raw.xtranssensor.ccSteps = v;
     raw.xtranssensor.exBlackRed = v;
     raw.xtranssensor.exBlackGreen = v;
@@ -998,6 +999,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
         raw.xtranssensor.method = raw.xtranssensor.method && p.raw.xtranssensor.method == other.raw.xtranssensor.method;
         raw.xtranssensor.dualDemosaicAutoContrast = raw.xtranssensor.dualDemosaicAutoContrast && p.raw.xtranssensor.dualDemosaicAutoContrast == other.raw.xtranssensor.dualDemosaicAutoContrast;
         raw.xtranssensor.dualDemosaicContrast = raw.xtranssensor.dualDemosaicContrast && p.raw.xtranssensor.dualDemosaicContrast == other.raw.xtranssensor.dualDemosaicContrast;
+        raw.xtranssensor.border = raw.xtranssensor.border && p.raw.xtranssensor.border == other.raw.xtranssensor.border;
         raw.xtranssensor.ccSteps = raw.xtranssensor.ccSteps && p.raw.xtranssensor.ccSteps == other.raw.xtranssensor.ccSteps;
         raw.xtranssensor.exBlackRed = raw.xtranssensor.exBlackRed && p.raw.xtranssensor.blackred == other.raw.xtranssensor.blackred;
         raw.xtranssensor.exBlackGreen = raw.xtranssensor.exBlackGreen && p.raw.xtranssensor.blackgreen == other.raw.xtranssensor.blackgreen;
@@ -2656,6 +2658,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
         toEdit.raw.xtranssensor.ccSteps         = mods.raw.xtranssensor.ccSteps;
     }
 
+    if (raw.xtranssensor.border) {
+        toEdit.raw.xtranssensor.border         = mods.raw.xtranssensor.border;
+    }
+
     if (raw.xtranssensor.exBlackRed) {
         toEdit.raw.xtranssensor.blackred        = dontforceSet && options.baBehav[ADDSET_RAWEXPOS_BLACKS] ? toEdit.raw.xtranssensor.blackred + mods.raw.xtranssensor.blackred : mods.raw.xtranssensor.blackred;
     }
@@ -3188,7 +3194,7 @@ bool RAWParamsEdited::BayerSensor::isUnchanged() const
 
 bool RAWParamsEdited::XTransSensor::isUnchanged() const
 {
-    return method && exBlackRed && exBlackGreen && exBlackBlue && dualDemosaicAutoContrast && dualDemosaicContrast;
+    return method && border && exBlackRed && exBlackGreen && exBlackBlue && dualDemosaicAutoContrast && dualDemosaicContrast;
 }
 
 bool RAWParamsEdited::isUnchanged() const
diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h
index 0bad2ab3c..d7b4e8af4 100644
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -790,6 +790,7 @@ public:
         bool method;
         bool dualDemosaicAutoContrast;
         bool dualDemosaicContrast;
+        bool border;
         bool ccSteps;
         bool exBlackRed;
         bool exBlackGreen;
diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc
index 1f3ef8b77..734f7c29b 100644
--- a/rtgui/partialpastedlg.cc
+++ b/rtgui/partialpastedlg.cc
@@ -841,6 +841,7 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
 
     if (!raw_border->get_active ()) {
         filterPE.raw.bayersensor.border = falsePE.raw.bayersensor.border;
+        filterPE.raw.xtranssensor.border = falsePE.raw.xtranssensor.border;
     }
 
     if (!raw_imagenum->get_active ()) {
diff --git a/rtgui/xtransprocess.cc b/rtgui/xtransprocess.cc
index 9639ce29d..49d64bd8f 100644
--- a/rtgui/xtransprocess.cc
+++ b/rtgui/xtransprocess.cc
@@ -27,6 +27,7 @@ using namespace rtengine::procparams;
 XTransProcess::XTransProcess () : FoldableToolPanel(this, "xtransprocess", M("TP_RAW_LABEL"), true)
 {
     auto m = ProcEventMapper::getInstance();
+    EvDemosaicBorder = m->newEvent(DEMOSAIC, "HISTORY_MSG_RAW_BORDER");
     EvDemosaicContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_DUALDEMOSAIC_CONTRAST");
     EvDemosaicAutoContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_DUALDEMOSAIC_AUTO_CONTRAST");
 
@@ -83,6 +84,18 @@ XTransProcess::XTransProcess () : FoldableToolPanel(this, "xtransprocess", M("TP
     dualDemosaicOptions->pack_start(*dualDemosaicContrast);
     pack_start( *dualDemosaicOptions, Gtk::PACK_SHRINK, 4);
 
+    borderbox = Gtk::manage(new Gtk::HBox());
+    border = Gtk::manage(new Adjuster(M("TP_RAW_BORDER"), 0, 16, 1, 7));
+    border->setAdjusterListener (this);
+
+    if (border->delay < options.adjusterMaxDelay) {
+        border->delay = options.adjusterMaxDelay;
+    }
+
+    border->show();
+    borderbox->pack_start(*border);
+    pack_start(*borderbox, Gtk::PACK_SHRINK, 4);
+
     pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 0 );
     ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"), 0, 5, 1, 0 ));
     ccSteps->setAdjusterListener (this);
@@ -106,6 +119,7 @@ void XTransProcess::read(const rtengine::procparams::ProcParams* pp, const Param
     disableListener ();
     methodconn.block (true);
 
+    border->setValue(pp->raw.xtranssensor.border);
     for (size_t i = 0; i < RAWParams::XTransSensor::getMethodStrings().size(); ++i)
         if( pp->raw.xtranssensor.method == RAWParams::XTransSensor::getMethodStrings()[i]) {
             method->set_active(i);
@@ -114,6 +128,7 @@ void XTransProcess::read(const rtengine::procparams::ProcParams* pp, const Param
         }
 
     if(pedited ) {
+        border->setEditedState (pedited->raw.xtranssensor.border ? Edited : UnEdited);
         dualDemosaicContrast->setAutoInconsistent   (multiImage && !pedited->raw.xtranssensor.dualDemosaicAutoContrast);
         dualDemosaicContrast->setEditedState ( pedited->raw.xtranssensor.dualDemosaicContrast ? Edited : UnEdited);
         ccSteps->setEditedState (pedited->raw.xtranssensor.ccSteps ? Edited : UnEdited);
@@ -126,7 +141,7 @@ void XTransProcess::read(const rtengine::procparams::ProcParams* pp, const Param
     dualDemosaicContrast->setValue (pp->raw.xtranssensor.dualDemosaicContrast);
     ccSteps->setValue (pp->raw.xtranssensor.ccSteps);
 
-    lastAutoContrast = pp->raw.bayersensor.dualDemosaicAutoContrast;
+    lastAutoContrast = pp->raw.xtranssensor.dualDemosaicAutoContrast;
 
     if (!batchMode) {
         dualDemosaicOptions->set_visible(pp->raw.xtranssensor.method == procparams::RAWParams::XTransSensor::getMethodString(procparams::RAWParams::XTransSensor::Method::FOUR_PASS)
@@ -142,6 +157,7 @@ void XTransProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* p
 {
     pp->raw.xtranssensor.dualDemosaicAutoContrast = dualDemosaicContrast->getAutoValue();
     pp->raw.xtranssensor.dualDemosaicContrast = dualDemosaicContrast->getValue();
+    pp->raw.xtranssensor.border = border->getIntValue();
     pp->raw.xtranssensor.ccSteps = ccSteps->getIntValue();
 
     int currentRow = method->get_active_row_number();
@@ -151,6 +167,7 @@ void XTransProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* p
     }
 
     if (pedited) {
+        pedited->raw.xtranssensor.border = border->getEditedState ();
         pedited->raw.xtranssensor.method = method->get_active_text() != M("GENERAL_UNCHANGED");
         pedited->raw.xtranssensor.dualDemosaicAutoContrast = !dualDemosaicContrast->getAutoInconsistent ();
         pedited->raw.xtranssensor.dualDemosaicContrast = dualDemosaicContrast->getEditedState ();
@@ -160,6 +177,7 @@ void XTransProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* p
 
 void XTransProcess::setAdjusterBehavior (bool falsecoloradd, bool dualDemosaicContrastAdd)
 {
+    border->setAddMode(false);
     dualDemosaicContrast->setAddMode(dualDemosaicContrastAdd);
     ccSteps->setAddMode(falsecoloradd);
 }
@@ -170,19 +188,23 @@ void XTransProcess::setBatchMode(bool batchMode)
     method->set_active_text(M("GENERAL_UNCHANGED"));
     ToolPanel::setBatchMode (batchMode);
     dualDemosaicContrast->showEditedCB ();
+    border->showEditedCB ();
     ccSteps->showEditedCB ();
 }
 
 void XTransProcess::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
 {
     dualDemosaicContrast->setDefault( defParams->raw.xtranssensor.dualDemosaicContrast);
+    border->setDefault (defParams->raw.xtranssensor.border);
     ccSteps->setDefault (defParams->raw.xtranssensor.ccSteps);
 
     if (pedited) {
         dualDemosaicContrast->setDefaultEditedState( pedited->raw.xtranssensor.dualDemosaicContrast ? Edited : UnEdited);
+        border->setDefaultEditedState(pedited->raw.xtranssensor.border ? Edited : UnEdited);
         ccSteps->setDefaultEditedState(pedited->raw.xtranssensor.ccSteps ? Edited : UnEdited);
     } else {
         dualDemosaicContrast->setDefaultEditedState(Irrelevant );
+        border->setDefaultEditedState(Irrelevant);
         ccSteps->setDefaultEditedState(Irrelevant );
     }
 }
@@ -194,6 +216,8 @@ void XTransProcess::adjusterChanged(Adjuster* a, double newval)
             listener->panelChanged (EvDemosaicFalseColorIter, a->getTextValue() );
         } else if (a == dualDemosaicContrast) {
             listener->panelChanged (EvDemosaicContrast, a->getTextValue() );
+        } else if (a == border) {
+            listener->panelChanged (EvDemosaicBorder, a->getTextValue() );
         }
     }
 }
diff --git a/rtgui/xtransprocess.h b/rtgui/xtransprocess.h
index cd60337dc..e5389b566 100644
--- a/rtgui/xtransprocess.h
+++ b/rtgui/xtransprocess.h
@@ -32,6 +32,8 @@ class XTransProcess : public ToolParamBlock, public AdjusterListener, public Che
 protected:
 
     MyComboBoxText* method;
+    Gtk::HBox* borderbox;
+    Adjuster* border;
     Adjuster* ccSteps;
     Gtk::VBox *dualDemosaicOptions;
     Adjuster* dualDemosaicContrast;
@@ -40,6 +42,8 @@ protected:
     int oldSelection;
     sigc::connection methodconn;
     IdleRegister idle_register;
+
+    rtengine::ProcEvent EvDemosaicBorder;
     rtengine::ProcEvent EvDemosaicAutoContrast;
     rtengine::ProcEvent EvDemosaicContrast;