diff --git a/NetNewsWire/MainWindow/Sidebar/Cell/SidebarCell.swift b/NetNewsWire/MainWindow/Sidebar/Cell/SidebarCell.swift
index 007620763..f6b841b42 100644
--- a/NetNewsWire/MainWindow/Sidebar/Cell/SidebarCell.swift
+++ b/NetNewsWire/MainWindow/Sidebar/Cell/SidebarCell.swift
@@ -90,13 +90,23 @@ class SidebarCell : NSTableCellView {
 	override var isFlipped: Bool {
 		return true
 	}
-	
+
+	override var textField: NSTextField? {
+		didSet {
+			textField?.translatesAutoresizingMaskIntoConstraints = false
+			updateTextFieldIsEditable()
+		}
+	}
+
+	override var imageView: NSImageView? {
+		didSet {
+			imageView?.translatesAutoresizingMaskIntoConstraints = false
+		}
+	}
+
 	private func commonInit() {
 		unreadCountView.translatesAutoresizingMaskIntoConstraints = false
-		imageView?.translatesAutoresizingMaskIntoConstraints = false
-		textField?.translatesAutoresizingMaskIntoConstraints = false
 		addSubview(unreadCountView)
-		updateTextFieldIsEditable()
 	}
 	
 	override init(frame frameRect: NSRect) {