diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp
index 806e8e0e6..e9ebdaad8 100644
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -674,7 +674,11 @@ MainWindow::MainWindow(QWidget *parent)
     /* Remove default Shift+F10 handler, which unfocuses keyboard input even with no context menu. */
     connect(new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_F10), this), &QShortcut::activated, this, [](){});
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    auto windowedShortcut = new QShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_PageDown), this);
+#else
     auto windowedShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_PageDown), this);
+#endif
     windowedShortcut->setContext(Qt::ShortcutContext::ApplicationShortcut);
     connect(windowedShortcut, &QShortcut::activated, this, [this] () {
         if (video_fullscreen)
diff --git a/src/scsi/scsi_spock.c b/src/scsi/scsi_spock.c
index c500abfbc..6f0b7aacb 100644
--- a/src/scsi/scsi_spock.c
+++ b/src/scsi/scsi_spock.c
@@ -1050,7 +1050,7 @@ spock_callback(void *priv)
             spock_execute_cmd(scsi, scb);
     }
 
-    if (scsi->attention_wait) {
+    if (scsi->attention_wait && ((scsi->scb_state == 0) || (scsi->attention_pending & 0xf0) == 0xe0)) {
         scsi->attention_wait--;
         if (!scsi->attention_wait) {
             scsi->attention = scsi->attention_pending;