diff --git a/src/nostalgia/core/studio/paletteeditor.cpp b/src/nostalgia/core/studio/paletteeditor.cpp
index a49e114d7..7b3ad8cce 100644
--- a/src/nostalgia/core/studio/paletteeditor.cpp
+++ b/src/nostalgia/core/studio/paletteeditor.cpp
@@ -347,7 +347,8 @@ Color16 PaletteEditor::rowColor(int row) const {
 }
 
 void PaletteEditor::colorSelected() {
-	auto row = m_table->currentRow();
+	auto selIdxs = m_table->selectionModel()->selectedIndexes();
+	auto row = selIdxs.size() ? selIdxs[0].row() : -1;
 	if (row > -1) {
 		m_rmBtn->setEnabled(true);
 		m_moveUpBtn->setEnabled(row > 0);