diff --git a/ui/drivers/qt/ui_qt_window.cpp b/ui/drivers/qt/ui_qt_window.cpp
index cf5ee3309f..096f0c4e06 100644
--- a/ui/drivers/qt/ui_qt_window.cpp
+++ b/ui/drivers/qt/ui_qt_window.cpp
@@ -73,6 +73,7 @@ extern "C" {
 #define HIRA_KATA_OFFSET (KATAKANA_START - HIRAGANA_START)

 static ui_window_qt_t ui_window = {0};
+bool load_core_locked_mode = false;

 enum CoreSelection
 {
@@ -1255,6 +1256,7 @@ void MainWindow::onLaunchWithComboBoxIndexChanged(int)
    if (coreSelection == CORE_SELECTION_LOAD_CORE)
    {
       onLoadCoreClicked();
+      load_core_locked_mode = true;
    }
    else
    {
@@ -1809,6 +1811,8 @@ void MainWindow::onRunClicked()
    {
       QTableWidgetItem *item = m_tableWidget->currentItem();
       QStringList extensionFilters;
+
+      load_core_locked_mode = false;

       if (item)
       {
@@ -2006,7 +2010,7 @@ void MainWindow::setCoreActions()
    else
       m_startCorePushButton->hide();

-   if (isCoreLoaded() && m_settings->value("suggest_loaded_core_first", false).toBool())
+   if (isCoreLoaded() && (m_settings->value("suggest_loaded_core_first", false).toBool() || load_core_locked_mode))
    {
       QVariantMap comboBoxMap;
       comboBoxMap["core_name"] = m_currentCore;