diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 251c10903..428ee958b 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -240,6 +240,11 @@ static UICompositeViewDescription *compositeDescription = nil;
                          completion:nil];
     }
 	[self configureForRoom:self.editing];
+	
+	// Resize the popup table depending on wether ephemeral messages are enabled or not.
+	CGRect popupFrame = _popupMenu.frame;
+	popupFrame.size.height = 44 * [_popupMenu numberOfRowsInSection:0];
+	_popupMenu.frame = popupFrame;
 
 }