diff --git a/ui/extends/shared/delegates/chartDelegate.py b/ui/extends/shared/delegates/chartDelegate.py
index cb9d738..6bd3299 100644
--- a/ui/extends/shared/delegates/chartDelegate.py
+++ b/ui/extends/shared/delegates/chartDelegate.py
@@ -138,7 +138,7 @@ class ChartDelegate(TextSegmentDelegate):
             ratingClass = None
 
         ratingText = (
-            f"{rating_class_to_text(chart.rating_class)} {chartConstantString}"
+            f"{rating_class_to_text(ratingClass)} {chartConstantString}"
             if ratingClass is not None
             else "Unknown ?"
         )
diff --git a/ui/implements/components/chartSelector.py b/ui/implements/components/chartSelector.py
index e39a795..5096b5b 100644
--- a/ui/implements/components/chartSelector.py
+++ b/ui/implements/components/chartSelector.py
@@ -27,7 +27,9 @@ class ChartSelector(Ui_ChartSelector, QWidget):
 
         self.valueChanged.connect(self.updateResultLabel)
         self.songIdSelector.valueChanged.connect(self.updateRatingClassEnabled)
-        self.songIdSelector.chartSelected.connect(self.selectChart)
+        self.songIdSelector.quickSearchActivated.connect(
+            self.__songIdSelectedQuickSearchActivated
+        )
 
         self.songIdSelector.valueChanged.connect(self.valueChanged)
         self.ratingClassSelector.valueChanged.connect(self.valueChanged)
@@ -86,7 +88,10 @@ class ChartSelector(Ui_ChartSelector, QWidget):
                 texts = [" | ".join(t) for t in texts]
                 text = f'{texts[0]}<br><font color="gray">{texts[1]}</font>'
             else:
-                text = f'No chart data<br><font color="gray">{chart.set} | {chart.song_id} | {chart.rating_class}</font>'
+                text = (
+                    "No chart data<br>"
+                    f'<font color="gray">{chart.set} | {chart.song_id} | {chart.rating_class}</font>'
+                )
             self.resultLabel.setText(text)
         else:
             self.resultLabel.setText("...")
@@ -106,5 +111,8 @@ class ChartSelector(Ui_ChartSelector, QWidget):
         self.songIdSelector.reset()
 
     def selectChart(self, chart: Chart):
+        self.songIdSelector.selectChart(chart)
+        self.ratingClassSelector.select(chart.rating_class)
+
+    def __songIdSelectedQuickSearchActivated(self, chart: Chart):
         self.ratingClassSelector.select(chart.rating_class)
-        return self.ratingClassSelector.value() == chart.rating_class
diff --git a/ui/implements/components/songIdSelector.py b/ui/implements/components/songIdSelector.py
index 6a3e0c8..ad610ac 100644
--- a/ui/implements/components/songIdSelector.py
+++ b/ui/implements/components/songIdSelector.py
@@ -23,7 +23,7 @@ class SongIdSelectorMode(IntEnum):
 
 class SongIdSelector(Ui_SongIdSelector, QWidget):
     valueChanged = Signal()
-    chartSelected = Signal(Chart)
+    quickSearchActivated = Signal(Chart)
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -209,13 +209,13 @@ class SongIdSelector(Ui_SongIdSelector, QWidget):
     def selectChart(self, chart: Chart):
         packSelected = self.selectPack(chart.set)
         songIdSelected = self.selectSongId(chart.song_id)
-        self.chartSelected.emit(chart)
         return packSelected and songIdSelected
 
     @Slot(QModelIndex)
     def searchCompleterSetSelection(self, index: QModelIndex):
-        chart = index.data(Qt.ItemDataRole.UserRole + 10)  # type: Chart
+        chart: Chart = index.data(Qt.ItemDataRole.UserRole + 10)
         self.selectChart(chart)
+        self.quickSearchActivated.emit(chart)
 
         self.searchLineEdit.clear()
         self.searchLineEdit.clearFocus()