diff --git a/app/node/output/track/tracklist.cpp b/app/node/output/track/tracklist.cpp
index 743c1b50b..07b7678c0 100644
--- a/app/node/output/track/tracklist.cpp
+++ b/app/node/output/track/tracklist.cpp
@@ -57,7 +57,11 @@ const QVector<TrackOutput *> &TrackList::GetTracks() const
 
 TrackOutput *TrackList::GetTrackAt(int index) const
 {
-  return track_cache_.at(index);
+  if (index < track_cache_.size()) {
+    return track_cache_.at(index);
+  } else {
+    return nullptr;
+  }
 }
 
 const rational &TrackList::GetTotalLength() const
diff --git a/app/widget/colorwheel/colorspacechooser.cpp b/app/widget/colorwheel/colorspacechooser.cpp
index 78b292098..14a58108c 100644
--- a/app/widget/colorwheel/colorspacechooser.cpp
+++ b/app/widget/colorwheel/colorspacechooser.cpp
@@ -85,7 +85,6 @@ ColorSpaceChooser::ColorSpaceChooser(ColorManager* color_manager, bool enable_in
       display_combobox_->setCurrentText(color_manager_->GetDefaultDisplay());
 
       connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::ComboBoxChanged);
-      connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::UpdateViews);
     }
 
     row++;
@@ -184,6 +183,10 @@ void ColorSpaceChooser::UpdateViews(const QString& display)
 
 void ColorSpaceChooser::ComboBoxChanged()
 {
+  if (sender() == display_combobox_) {
+    UpdateViews(display_combobox_->currentText());
+  }
+
   if (input_combobox_) {
     emit InputColorSpaceChanged(input());
   }