diff --git a/iOS/Master/Cell/MasterTableViewCell.swift b/iOS/Master/Cell/MasterTableViewCell.swift
index 8cea92c37..c74d90ddb 100644
--- a/iOS/Master/Cell/MasterTableViewCell.swift
+++ b/iOS/Master/Cell/MasterTableViewCell.swift
@@ -112,7 +112,8 @@ class MasterTableViewCell : UITableViewCell {
 	
 	override func layoutSubviews() {
 		super.layoutSubviews()
-		let layout = MasterTableViewCellLayout(cellSize: bounds.size, insets: safeAreaInsets, shouldShowImage: shouldShowImage, label: titleView, unreadCountView: unreadCountView, showingEditingControl: showingEditControl, indent: indentationLevel == 1, shouldShowDisclosure: !showsReorderControl)
+		let shouldShowDisclosure = !(showingEditControl && showsReorderControl)
+		let layout = MasterTableViewCellLayout(cellSize: bounds.size, insets: safeAreaInsets, shouldShowImage: shouldShowImage, label: titleView, unreadCountView: unreadCountView, showingEditingControl: showingEditControl, indent: indentationLevel == 1, shouldShowDisclosure: shouldShowDisclosure)
 		layoutWith(layout)
 	}