diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
index 1ed0be4082..99ab5451f8 100644
--- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
+++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
@@ -335,7 +335,13 @@ public class WebRtcCallScreen extends FrameLayout implements Recipient.Recipient
       ViewCompat.animate(callHeader).translationY(0);
       ViewCompat.animate(status).alpha(1);
       ViewCompat.animate(endCallButton).translationY(0);
-      ViewCompat.animate(endCallButton).alpha(1);
+      ViewCompat.animate(endCallButton).alpha(1).withEndAction(new Runnable() {
+        @Override
+        public void run() {
+          // Note: This is to work around an Android bug, see #6225
+          endCallButton.requestLayout();
+        }
+      });
 
       this.minimized = false;
     }