modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml

@@ -212,44 +212,65 @@ FocusScope {
                 }
             }
 
-            header: Column {
+            header: FocusScope {
+                id: headerFocusScope
+
                 width: tracks.width
                 height: implicitHeight
-                bottomPadding: VLCStyle.margin_large
+                implicitHeight: col.implicitHeight
+
+                focus: true
+
+                Navigation.parentItem: root
+                Navigation.leftItem: enqueueActionBtn
+                Navigation.downAction: function () {
+                    if (tracks.count > 0) {
+                        tracks.setCurrentItemFocus(Qt.TabFocus)
+                    } else {
+                        root.Navigation.downAction()
+                    }
+                }
 
-                RowLayout {
-                    width: parent.width
 
-                    /* The title of the albums */
-                    Widgets.SubtitleLabel {
-                        id: expand_infos_title_id
+                Column {
+                    id: col
 
-                        text: Helpers.get(model, "title", I18n.qtr("Unknown title"))
+                    anchors.fill: parent
+                    bottomPadding: VLCStyle.margin_large
 
-                        Layout.fillWidth: true
-                    }
+                    RowLayout {
+                        width: parent.width
 
-                    Widgets.IconLabel {
-                        text: VLCIcons.close
+                        /* The title of the albums */
+                        Widgets.SubtitleLabel {
+                            id: expand_infos_title_id
 
-                        Layout.rightMargin: VLCStyle.margin_small
+                            text: Helpers.get(model, "title", I18n.qtr("Unknown title"))
+
+                            Layout.fillWidth: true
+                        }
+
+                        Widgets.IconControlButton {
+                            iconText: VLCIcons.close
+                            focus: true
+
+                            Navigation.parentItem: headerFocusScope
+                            Layout.rightMargin: VLCStyle.margin_small
 
-                        MouseArea {
-                            anchors.fill: parent
                             onClicked: root.retract()
                         }
                     }
-                }
 
-                Widgets.CaptionLabel {
-                    id: expand_infos_subtitle_id
-
-                    width: parent.width
-                    text: I18n.qtr("%1 - %2 - %3 - %4")
-                        .arg(Helpers.get(model, "main_artist", I18n.qtr("Unknown artist")))
-                        .arg(Helpers.get(model, "release_year", ""))
-                        .arg(_getStringTrack())
-                        .arg((model && model.duration) ? model.duration.formatHMS() : 0)
+                    Widgets.CaptionLabel {
+                        id: expand_infos_subtitle_id
+
+                        width: parent.width
+                        text: I18n.qtr("%1 - %2 - %3 - %4")
+                            .arg(Helpers.get(model, "main_artist", I18n.qtr("Unknown artist")))
+                            .arg(Helpers.get(model, "release_year", ""))
+                            .arg(_getStringTrack())
+                            .arg((model && model.duration) ? model.duration.formatHMS() : 0)
+                    }
                 }
             }
 
@@ -275,6 +296,7 @@ FocusScope {
 
             Navigation.parentItem: root
             Navigation.leftItem: actionButtons
+            Navigation.upItem: headerItem
 
             Widgets.TableColumns {
                 id: tableColumns

modules/gui/qt/widgets/qml/KeyNavigableTableView.qml

@@ -108,6 +108,8 @@ FocusScope {
 
     property alias displayMarginEnd: view.displayMarginEnd
 
+    property alias count: view.count
+
     // Signals
 
     //forwarded from subview