diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt
index 6702b1abc..a984526c3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/scrobbling/common/ui/selector/ScrobblingSelectorViewModel.kt
@@ -152,11 +152,11 @@ class ScrobblingSelectorViewModel @Inject constructor(
 			val history = historyRepository.getOne(manga)
 			currentScrobbler.updateScrobblingInfo(
 				mangaId = manga.id,
-				rating = prevInfo?.rating ?: manga.rating,
-				status = prevInfo?.status ?: if (history == null) {
-					ScrobblingStatus.PLANNED
-				} else {
-					ScrobblingStatus.READING
+				rating = prevInfo?.rating ?: 0f,
+				status = prevInfo?.status ?: when {
+					history == null -> ScrobblingStatus.PLANNED
+					history.percent == 1f -> ScrobblingStatus.COMPLETED
+					else -> ScrobblingStatus.READING
 				},
 				comment = prevInfo?.comment,
 			)
diff --git a/app/src/main/res/layout/sheet_scrobbling.xml b/app/src/main/res/layout/sheet_scrobbling.xml
index b61b10051..41330ffc8 100644
--- a/app/src/main/res/layout/sheet_scrobbling.xml
+++ b/app/src/main/res/layout/sheet_scrobbling.xml
@@ -79,14 +79,16 @@
 
 		<RatingBar
 			android:id="@+id/ratingBar"
-			android:layout_width="0dp"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="6dp"
 			android:layout_marginEnd="16dp"
 			android:numStars="5"
 			android:stepSize="0.5"
+			app:layout_constrainedWidth="true"
 			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHorizontal_bias="0"
 			app:layout_constraintStart_toEndOf="@id/imageView_cover"
 			app:layout_constraintTop_toBottomOf="@id/textView_title"
 			tools:rating="3.5"