diff --git a/app/gui/NavigableMenu.qml b/app/gui/NavigableMenu.qml
index 301437de..72ba3ef0 100644
--- a/app/gui/NavigableMenu.qml
+++ b/app/gui/NavigableMenu.qml
@@ -3,6 +3,13 @@ import QtQuick.Controls 2.2
 
 Menu {
     onOpened: {
-        itemAt(0).forceActiveFocus(Qt.TabFocusReason)
+        // Give focus to the first visible and enabled menu item
+        for (var i = 0; i < count; i++) {
+            var item = itemAt(i)
+            if (item.visible && item.enabled) {
+                item.forceActiveFocus(Qt.TabFocusReason)
+                break
+            }
+        }
     }
 }
diff --git a/app/gui/PcView.qml b/app/gui/PcView.qml
index b80b0259..35062d7c 100644
--- a/app/gui/PcView.qml
+++ b/app/gui/PcView.qml
@@ -162,6 +162,11 @@ CenteredGridView {
 
         NavigableMenu {
             id: pcContextMenu
+            MenuItem {
+                text: qsTr("PC Status: %1").arg(model.online ? qsTr("Online") : qsTr("Offline"))
+                font.bold: true
+                enabled: false
+            }
             NavigableMenuItem {
                 parentMenu: pcContextMenu
                 text: qsTr("View All Apps")