diff --git a/lib/components/shared/adaptive/adaptive_popup_menu_button.dart b/lib/components/shared/adaptive/adaptive_popup_menu_button.dart
index 72a9b7876..e1a6e95af 100644
--- a/lib/components/shared/adaptive/adaptive_popup_menu_button.dart
+++ b/lib/components/shared/adaptive/adaptive_popup_menu_button.dart
@@ -23,8 +23,8 @@ class Action extends StatelessWidget {
       return PlatformIconButton(
         icon: icon,
         onPressed: onPressed,
-        tooltip: text is Text
-            ? (text as Text).data
+        tooltip: text is PlatformText
+            ? (text as PlatformText).data
             : text.toStringShallow().split(",").last.replaceAll(
                   "\"",
                   "",
diff --git a/lib/components/shared/sort_tracks_dropdown.dart b/lib/components/shared/sort_tracks_dropdown.dart
index d66d2279d..2279a44ed 100644
--- a/lib/components/shared/sort_tracks_dropdown.dart
+++ b/lib/components/shared/sort_tracks_dropdown.dart
@@ -47,6 +47,7 @@ class SortTracksDropdown extends StatelessWidget {
         ),
       ],
       onSelected: onChanged,
+      tooltip: "Sort tracks",
       child: const Icon(Icons.sort_rounded),
     );
   }
diff --git a/lib/components/shared/track_table/tracks_table_view.dart b/lib/components/shared/track_table/tracks_table_view.dart
index d8782bf68..74a390b8d 100644
--- a/lib/components/shared/track_table/tracks_table_view.dart
+++ b/lib/components/shared/track_table/tracks_table_view.dart
@@ -131,6 +131,7 @@ class TracksTableView extends HookConsumerWidget {
                 ),
                 PlatformPopupMenuButton(
                   closeAfterClick: false,
+                  tooltip: "More Actions",
                   items: [
                     PlatformPopupMenuItem(
                       enabled: selectedTracks.isNotEmpty,