diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp
index 6f3537fc1e..39dc8f89be 100644
--- a/src/apps/mediaplayer/MainWin.cpp
+++ b/src/apps/mediaplayer/MainWin.cpp
@@ -1205,9 +1205,6 @@ MainWin::_SetupWindow()
 //	printf("MainWin::_SetupWindow\n");
 	// Populate the track menus
 	_SetupTrackMenus(fAudioTrackMenu, fVideoTrackMenu);
-	// Enable both if a file was loaded
-	fAudioTrackMenu->SetEnabled(fHasFile);
-	fVideoTrackMenu->SetEnabled(fHasFile);
 
 	fVideoMenu->SetEnabled(fHasVideo);
 	fAudioMenu->SetEnabled(fHasAudio);
@@ -1422,6 +1419,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu)
 		audioTrackMenu->AddItem(new BMenuItem("none", new BMessage(M_DUMMY)));
 		audioTrackMenu->ItemAt(0)->SetMarked(true);
 	}
+	audioTrackMenu->SetEnabled(count > 1);
 
 
 	count = fController->VideoTrackCount();
@@ -1437,6 +1435,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu)
 		videoTrackMenu->AddItem(new BMenuItem("none", new BMessage(M_DUMMY)));
 		videoTrackMenu->ItemAt(0)->SetMarked(true);
 	}
+	videoTrackMenu->SetEnabled(count > 1);
 }