diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 0cee6a4..5b035cf 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -276,16 +276,24 @@ void MainWindow::updateUI()
         button->setCheckable(true);
         button->setAutoExclusive(true);
 
-        connect(button, &QPushButton::clicked, this, [=]() {
+        auto populateAndNavigate = [=]() {
             if (isNvme) {
                 populateWindow(localObj, health, nvmeSmartOrdered);
             } else {
                 populateWindow(localObj, health);
             }
             updateNavigationButtons(buttonGroup->buttons().indexOf(button));
+        };
+
+        connect(button, &QPushButton::clicked, this, [=]() {
+            populateAndNavigate();
             disksGroup->actions()[buttonGroup->buttons().indexOf(button)]->setChecked(true);
         });
 
+        connect(diskAction, &QAction::triggered, this, [=]() {
+            populateAndNavigate();
+        });
+
         if (firstTime) {
             globalObj = localObj;
             globalHealth = health;