diff --git a/kstars/ekos/align/optionsprofileeditor.cpp b/kstars/ekos/align/optionsprofileeditor.cpp
index 394044306484c80b221fc58c0441b44a8c67bd24..ac8281873af5bfdbb469a82782e740fd6ae4f58f 100644
--- a/kstars/ekos/align/optionsprofileeditor.cpp
+++ b/kstars/ekos/align/optionsprofileeditor.cpp
@@ -169,6 +169,7 @@ SSolver::Parameters OptionsProfileEditor::getSettingsFromUI()
     params.solverTimeLimit = solverTimeLimit->text().toInt();
 
     params.resort = resort->isChecked();
+    params.autoDownsample = autoDownsample->isChecked();
     params.downsample = downsample->value();
     params.search_radius = radius->text().toDouble();
 
@@ -204,6 +205,7 @@ void OptionsProfileEditor::sendSettingsToUI(SSolver::Parameters a)
 
     //Astrometry Settings
 
+        autoDownsample->setChecked(a.autoDownsample);
         downsample->setValue(a.downsample);
         inParallel->setChecked(a.inParallel);
         multiAlgo->setCurrentIndex(a.multiAlgorithm);
diff --git a/kstars/ekos/align/optionsprofileeditor.ui b/kstars/ekos/align/optionsprofileeditor.ui
index 4de2495991951864b8a2e0fab63817e3c596960b..6074ce889ef7ec4bff2295635105b9ff385dbbf2 100644
--- a/kstars/ekos/align/optionsprofileeditor.ui
+++ b/kstars/ekos/align/optionsprofileeditor.ui
@@ -557,24 +557,17 @@
       <string>Astrometry Parameters</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
-      <item row="3" column="0">
+      <item row="5" column="0">
        <widget class="QLabel" name="label_29">
         <property name="text">
          <string>Maximum time</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="label_27">
-        <property name="text">
-         <string>Min Degree Width</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
+      <item row="4" column="2">
        <widget class="QSpinBox" name="downsample">
         <property name="toolTip">
-         <string>Factor to use for downsampling the image before SEP for plate solving.  Can speed it up.  Note: This should ONLY be used for SEP used for solving, not for Sextraction</string>
+         <string>Factor to use for downsampling the image before SEP for plate solving.  Can speed it up.</string>
         </property>
         <property name="minimum">
          <number>1</number>
@@ -584,24 +577,21 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="resort">
-        <property name="toolTip">
-         <string>Whether to resort the stars based on magnitude. NOTE: This is REQUIRED to be true for the filters above</string>
-        </property>
+      <item row="5" column="3">
+       <widget class="QLabel" name="label_9">
         <property name="text">
-         <string>Resort</string>
+         <string>Search Radius</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
+      <item row="4" column="0">
        <widget class="QLabel" name="label_16">
         <property name="text">
          <string>DownSample</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="3" column="2">
        <widget class="QComboBox" name="multiAlgo">
         <property name="toolTip">
          <string>Algorithm for running multiple threads on possibly multiple cores to solve faster</string>
@@ -631,24 +621,37 @@
         </item>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_33">
+      <item row="4" column="4">
+       <widget class="QLineEdit" name="maxWidth">
+        <property name="toolTip">
+         <string>If no scale estimate is given, this is the limit on the maximum field width in degrees.</string>
+        </property>
         <property name="text">
-         <string>Parallel Algorithm</string>
+         <string>180</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="QLineEdit" name="solverTimeLimit">
+      <item row="5" column="4">
+       <widget class="QLineEdit" name="radius">
         <property name="toolTip">
-         <string>Give up solving after the specified number of seconds of CPU time</string>
+         <string>Only search in indexes within 'radius' of the field center given by RA and DEC</string>
         </property>
         <property name="text">
-         <string>600</string>
+         <string>15</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="3">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="resort">
+        <property name="toolTip">
+         <string>Whether to resort the stars based on magnitude. NOTE: This is REQUIRED to be true for the filters above</string>
+        </property>
+        <property name="text">
+         <string>Resort</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="4">
        <widget class="QLineEdit" name="minWidth">
         <property name="toolTip">
          <string>If no scale estimate is given, this is the limit on the minimum field width in degrees.</string>
@@ -658,41 +661,51 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QLabel" name="label_28">
+      <item row="3" column="3">
+       <widget class="QLabel" name="label_27">
         <property name="text">
-         <string>Max Degree Width</string>
+         <string>Min Degree Width</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="3">
-       <widget class="QLineEdit" name="maxWidth">
-        <property name="toolTip">
-         <string>If no scale estimate is given, this is the limit on the maximum field width in degrees.</string>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_33">
+        <property name="text">
+         <string>Parallel Algorithm</string>
         </property>
+       </widget>
+      </item>
+      <item row="4" column="3">
+       <widget class="QLabel" name="label_28">
         <property name="text">
-         <string>180</string>
+         <string>Max Degree Width</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="2">
-       <widget class="QLabel" name="label_9">
+      <item row="5" column="2">
+       <widget class="QLineEdit" name="solverTimeLimit">
+        <property name="toolTip">
+         <string>Give up solving after the specified number of seconds of CPU time</string>
+        </property>
         <property name="text">
-         <string>Search Radius</string>
+         <string>600</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="3">
-       <widget class="QLineEdit" name="radius">
+      <item row="0" column="2">
+       <widget class="QCheckBox" name="autoDownsample">
         <property name="toolTip">
-         <string>Only search in indexes within 'radius' of the field center given by RA and DEC</string>
+         <string>Automatically Downsamples the image based on the image size</string>
         </property>
         <property name="text">
-         <string>15</string>
+         <string>Auto DownSample</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" colspan="3">
+      <item row="0" column="3" colspan="2">
        <widget class="QCheckBox" name="inParallel">
         <property name="toolTip">
          <string>Check the indices in parallel by loading them simultaneously into memory? If the indices you are using take less than 2 GB of space, and you have at least as much physical memory as indices, you want this enabled.</string>