 		if !super.becomeFirstResponder() {
 			return false
 		}
-		expandCollapse()
+
+		if isExpandedCellVisible {
+			assignTintColors()
+		} else {
+			expandCollapse()
+		}
+
 		return true
 	}
 	

		return 60
	}
	
	public func form_didSelectRow(row: RowRef) {
		if model.expandCollapseWhenSelectingRow == false {
			return
		}
		
		if isFirstResponder() {
			resignFirstResponder()
		} else {
			becomeFirstResponder()

	// MARK: UIResponder
	
	public override func canBecomeFirstResponder() -> Bool {
		if model.expandCollapseWhenSelectingRow == false {
			return false
		}
		return true
	}
	
