diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.kt b/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.kt
index 71c98a7e76..a09a6edc28 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.kt
@@ -182,9 +182,9 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
       }
     } else if (!overridingKeyboard) {
       if (!keyboardAnimator.animating) {
-        keyboardGuideline?.setGuidelineEnd(windowInsets.bottom)
+        keyboardGuideline?.setGuidelineEnd(navigationBar)
       } else {
-        keyboardAnimator.endingGuidelineEnd = windowInsets.bottom
+        keyboardAnimator.endingGuidelineEnd = navigationBar
       }
     }