diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ScreenSolfa.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ScreenSolfa.kt
index be7028c..9d1fc4a 100644
--- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ScreenSolfa.kt
+++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ScreenSolfa.kt
@@ -251,14 +251,6 @@ object ScreenSolfa : Screen {
                                     tint = if (isEditMode) ColorPrefixB else Color.Gray
                                 )
                             }
-                            MGButton(onClick = {
-                                //showContent = !showContent
-
-                                solfaScreenModel.loadNextInPlaylist()
-                            }, modifier = Modifier.height(40.dp)) {
-                                val nextLabel: String by sharedScreenModel.nextLabel.collectAsState()
-                                Text(nextLabel)
-                            }
                             if (altFiles.size > 1) {
                                 altFiles.forEachIndexed { index, item ->
                                     val isSelected = item.path == activeFilePath
@@ -318,8 +310,23 @@ object ScreenSolfa : Screen {
                         }
                         Row (
                             modifier = Modifier
-                                .height(75.dp)
+                                .fillMaxWidth()
+                                .padding(top = 16.dp, bottom = 32.dp, end = 65.dp),
+                            horizontalArrangement = Arrangement.End,
+                            verticalAlignment = Alignment.CenterVertically
                         ) {
+                            val nextLabel: String by sharedScreenModel.nextLabel.collectAsState()
+
+                            if (nextLabel.isNotBlank()) {
+                                MGButton(
+                                    onClick = {
+                                        solfaScreenModel.loadNextInPlaylist()
+                                    },
+                                    modifier = Modifier.height(40.dp)
+                                ) {
+                                    Text(nextLabel)
+                                }
+                            }
                         }
                     }
                 }