diff --git a/WordPress/Classes/ViewRelated/Settings/ActivityLogViewController.m b/WordPress/Classes/ViewRelated/Settings/ActivityLogViewController.m
index d5f26f84507c..edf687178796 100644
--- a/WordPress/Classes/ViewRelated/Settings/ActivityLogViewController.m
+++ b/WordPress/Classes/ViewRelated/Settings/ActivityLogViewController.m
@@ -40,6 +40,9 @@ - (id)init
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    
+    [self.tableView setEstimatedRowHeight:50.f];
+    [self.tableView setRowHeight:UITableViewAutomaticDimension];
 
     [WPStyleGuide configureColorsForView:self.view andTableView:self.tableView];
     [self loadLogFiles];
diff --git a/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m b/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m
index d671e7e46ce6..b9eccf6b9b78 100644
--- a/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m
+++ b/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m
@@ -68,6 +68,9 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
 
+    [self.tableView setEstimatedRowHeight:50.f];
+    [self.tableView setRowHeight:UITableViewAutomaticDimension];
+    
     self.title = NSLocalizedString(@"Settings", @"App Settings");
     self.doneButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:[WPStyleGuide barButtonStyleForBordered] target:self action:@selector(dismiss)];
     self.navigationItem.rightBarButtonItem = self.doneButton;
diff --git a/WordPress/Classes/ViewRelated/Settings/SupportViewController.m b/WordPress/Classes/ViewRelated/Settings/SupportViewController.m
index a2c187cb84a5..77f32e5061a0 100644
--- a/WordPress/Classes/ViewRelated/Settings/SupportViewController.m
+++ b/WordPress/Classes/ViewRelated/Settings/SupportViewController.m
@@ -138,6 +138,9 @@ - (id)init
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    
+    [self.tableView setEstimatedRowHeight:50.f];
+    [self.tableView setRowHeight:UITableViewAutomaticDimension];
 
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     self.feedbackEnabled = [defaults boolForKey:UserDefaultsFeedbackEnabled];