3 files changed, 11 insertions, 9 deletions
diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui
index 660b68c1c..9241678e4 100644
--- a/src/yuzu/configuration/configure_graphics.ui
+++ b/src/yuzu/configuration/configure_graphics.ui
@@ -429,7 +429,7 @@
              </item>
              <item>
               <property name="text">
-               <string>AMD's FidelityFX™️ Super Resolution [Vulkan Only]</string>
+               <string>AMD FidelityFX™️ Super Resolution [Vulkan Only]</string>
               </property>
              </item>
             </widget>
diff --git a/src/yuzu/hotkeys.cpp b/src/yuzu/hotkeys.cpp
index d4e97fa16..e7e58f314 100644
--- a/src/yuzu/hotkeys.cpp
+++ b/src/yuzu/hotkeys.cpp
@@ -46,6 +46,8 @@ QShortcut* HotkeyRegistry::GetHotkey(const QString& group, const QString& action
     if (!hk.shortcut)
         hk.shortcut = new QShortcut(hk.keyseq, widget, nullptr, nullptr, hk.context);
 
+    hk.shortcut->setAutoRepeat(false);
+
     return hk.shortcut;
 }
 
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index d057dc889..c4c76b094 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1031,7 +1031,7 @@ void GMainWindow::InitializeHotkeys() {
             &QShortcut::activatedAmbiguously, ui->action_Fullscreen, &QAction::trigger);
     connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Exit Fullscreen"), this),
             &QShortcut::activated, this, [&] {
-                if (emulation_running) {
+                if (emulation_running && ui->action_Fullscreen->isChecked()) {
                     ui->action_Fullscreen->setChecked(false);
                     ToggleFullscreen();
                 }
@@ -3106,7 +3106,7 @@ void GMainWindow::UpdateFilterText() {
         filter_status_button->setText(tr("SCALEFORCE"));
         break;
     case Settings::ScalingFilter::Fsr:
-        filter_status_button->setText(tr("AMD'S FIDELITYFX SR"));
+        filter_status_button->setText(tr("FSR"));
         break;
     default:
         filter_status_button->setText(tr("BILINEAR"));
@@ -3117,15 +3117,15 @@ void GMainWindow::UpdateFilterText() {
 void GMainWindow::UpdateAAText() {
     const auto aa_mode = Settings::values.anti_aliasing.GetValue();
     switch (aa_mode) {
-    case Settings::AntiAliasing::Fxaa:
-        aa_status_button->setText(tr("FXAA"));
-        break;
     case Settings::AntiAliasing::None:
         aa_status_button->setText(tr("NO AA"));
         break;
-    default:
+    case Settings::AntiAliasing::Fxaa:
         aa_status_button->setText(tr("FXAA"));
         break;
+    default:
+        aa_status_button->setText(tr("NO AA"));
+        break;
     }
 }
 
@@ -3300,9 +3300,9 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {
         if (!errors.isEmpty()) {
             QMessageBox::warning(
                 this, tr("Derivation Components Missing"),
-                tr("Components are missing that may hinder key derivation from completing. "
+                tr("Encryption keys are missing. "
                    "<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu "
-                   "quickstart guide</a> to get all your keys and "
+                   "quickstart guide</a> to get all your keys, firmware and "
                    "games.<br><br><small>(%1)</small>")
                     .arg(errors));
         }