diff --git a/Signal/src/view controllers/OWSLinkedDevicesTableViewController.m b/Signal/src/view controllers/OWSLinkedDevicesTableViewController.m
index a36708d6a..e319e9d39 100644
--- a/Signal/src/view controllers/OWSLinkedDevicesTableViewController.m	
+++ b/Signal/src/view controllers/OWSLinkedDevicesTableViewController.m	
@@ -65,6 +65,9 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1;
 {
     [super viewWillAppear:animated];
     [self refreshDevices];
+    // HACK to unselect rows when swiping back
+    // http://stackoverflow.com/questions/19379510/uitableviewcell-doesnt-get-deselected-when-swiping-back-quickly
+    [self.tableView deselectRowAtIndexPath:[self.tableView indexPathForSelectedRow] animated:animated];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
diff --git a/Signal/src/view controllers/SettingsTableViewController.m b/Signal/src/view controllers/SettingsTableViewController.m
index ad0541618..34fd0a599 100644
--- a/Signal/src/view controllers/SettingsTableViewController.m	
+++ b/Signal/src/view controllers/SettingsTableViewController.m	
@@ -85,6 +85,14 @@ typedef enum {
                                forState:UIControlStateNormal];
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    // HACK to unselect rows when swiping back
+    // http://stackoverflow.com/questions/19379510/uitableviewcell-doesnt-get-deselected-when-swiping-back-quickly
+    [self.tableView deselectRowAtIndexPath:[self.tableView indexPathForSelectedRow] animated:animated];
+}
+
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:SocketOpenedNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:SocketClosedNotification object:nil];