diff --git a/src/preferences/dialog/dlgprefbeats.cpp b/src/preferences/dialog/dlgprefbeats.cpp
index 73fbb8a8129..ee23261c88a 100644
--- a/src/preferences/dialog/dlgprefbeats.cpp
+++ b/src/preferences/dialog/dlgprefbeats.cpp
@@ -103,7 +103,7 @@ void DlgPrefBeats::slotUpdate() {
     // Fast analysis cannot be combined with non-constant tempo beatgrids.
     checkBoxFastAnalysis->setEnabled(m_bAnalyzerEnabled && m_bFixedTempoEnabled);
     checkBoxReanalyse->setEnabled(m_bAnalyzerEnabled);
-    checkBoxReanalyseImported->setEnabled(m_bReanalyzeImported);
+    checkBoxReanalyseImported->setEnabled(m_bAnalyzerEnabled);
 
     if (!m_bAnalyzerEnabled) {
         return;
@@ -133,6 +133,7 @@ void DlgPrefBeats::slotUpdate() {
     checkBoxFastAnalysis->setChecked(m_bFastAnalysisEnabled && m_bFixedTempoEnabled);
 
     checkBoxReanalyse->setChecked(m_bReanalyze);
+    checkBoxReanalyseImported->setChecked(m_bReanalyzeImported);
 }
 
 void DlgPrefBeats::slotReanalyzeChanged(int value) {
diff --git a/src/preferences/dialog/dlgprefbeatsdlg.ui b/src/preferences/dialog/dlgprefbeatsdlg.ui
index 4d59c908dbb..29cae861eda 100644
--- a/src/preferences/dialog/dlgprefbeatsdlg.ui
+++ b/src/preferences/dialog/dlgprefbeatsdlg.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>564</width>
+    <width>576</width>
     <height>400</height>
    </rect>
   </property>
@@ -45,26 +45,26 @@ automatically shows a beat-grid for them, and allows you to synchronize tracks u
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QCheckBox" name="checkBoxFastAnalysis">
+       <widget class="QCheckBox" name="checkBoxFixedTempo">
         <property name="toolTip">
-         <string>Enable fast beat detection.
-If activated Mixxx only analyzes the first minute of a track for beat information.
-This can speed up beat detection on slower computers but may result in lower quality beatgrids.</string>
+         <string>Converts beats detected by the analyzer into a fixed-tempo beatgrid.
+Use this setting if your tracks have a constant tempo (e.g. most electronic music).
+Often results in higher quality beatgrids, but will not do well on tracks that have tempo shifts.</string>
         </property>
         <property name="text">
-         <string>Enable Fast Analysis (For slow computers, may be less accurate)</string>
+         <string>Assume constant tempo (Recommended)</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="checkBoxFixedTempo">
+       <widget class="QCheckBox" name="checkBoxFastAnalysis">
         <property name="toolTip">
-         <string>Converts beats detected by the analyzer into a fixed-tempo beatgrid.
-Use this setting if your tracks have a constant tempo (e.g. most electronic music).
-Often results in higher quality beatgrids, but will not do well on tracks that have tempo shifts.</string>
+         <string>Enable fast beat detection.
+If activated Mixxx only analyzes the first minute of a track for beat information.
+This can speed up beat detection on slower computers but may result in lower quality beatgrids.</string>
         </property>
         <property name="text">
-         <string>Assume constant tempo (Recommended)</string>
+         <string>Enable Fast Analysis (For slow computers, may be less accurate)</string>
         </property>
        </widget>
       </item>
@@ -148,7 +148,6 @@ Often results in higher quality beatgrids, but will not do well on tracks that h
  <tabstops>
   <tabstop>checkBoxAnalyzerEnabled</tabstop>
   <tabstop>comboBoxBeatPlugin</tabstop>
-  <tabstop>checkBoxFastAnalysis</tabstop>
   <tabstop>checkBoxFixedTempo</tabstop>
   <tabstop>checkBoxReanalyse</tabstop>
   <tabstop>checkBoxReanalyseImported</tabstop>