diff --git a/src/apps/mediaplayer/ControllerView.cpp b/src/apps/mediaplayer/ControllerView.cpp
index 4c9f03499b..4bc98e6a39 100644
--- a/src/apps/mediaplayer/ControllerView.cpp
+++ b/src/apps/mediaplayer/ControllerView.cpp
@@ -135,7 +135,10 @@ void
 ControllerView::SkipBackward()
 {
 	BAutolock _(fPlaylist);
-	fPlaylist->SetCurrentItemIndex(fPlaylist->CurrentItemIndex() - 1);
+	int32 index = fPlaylist->CurrentItemIndex() - 1;
+	if (index < 0)
+		index = 0;
+	fPlaylist->SetCurrentItemIndex(index);
 }
 
 
@@ -143,7 +146,10 @@ void
 ControllerView::SkipForward()
 {
 	BAutolock _(fPlaylist);
-	fPlaylist->SetCurrentItemIndex(fPlaylist->CurrentItemIndex() + 1);
+	int32 index = fPlaylist->CurrentItemIndex() + 1;
+	if (index >= fPlaylist->CountItems())
+		index = fPlaylist->CountItems() - 1;
+	fPlaylist->SetCurrentItemIndex(index);
 }