diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt
index b58b9ce..c74b743 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RebaseInteractive.kt
@@ -139,7 +139,7 @@ fun RebaseCommit(
         AdjustableOutlinedTextField(
             modifier = Modifier
                 .weight(1f)
-                .height(40.dp),
+                .heightIn(min = 40.dp),
             enabled = rebaseLine.action == Action.REWORD,
             value = newMessage,
             onValueChange = {
@@ -147,6 +147,10 @@ fun RebaseCommit(
                 onMessageChanged(it)
             },
             textStyle = MaterialTheme.typography.body2,
+            backgroundColor = if(rebaseLine.action == Action.REWORD) {
+                MaterialTheme.colors.background
+            } else
+                MaterialTheme.colors.surface
         )
 
     }
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt
index a2200d2..495c7d8 100644
--- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt
+++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/AdjustableOutlinedTextField.kt
@@ -57,7 +57,6 @@ fun AdjustableOutlinedTextField(
     Box(
         modifier = modifier
             .height(IntrinsicSize.Min)
-            .background(Color.Red)
     ) {
         BasicTextField(
             modifier = Modifier