diff --git a/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
index 1b64c7d4bc..9ba149b776 100644
--- a/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
+++ b/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
@@ -77,9 +77,9 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   }
 
   @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     updateRotation();
     updateKeyboardState();
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
   }
 
   private void updateRotation() {