         self.cardsRemainingLabel.text = String(CardCollection.instance.getCardsRemainingForTeam(Player.instance.team))
         
         if Round.instance.currentTeam == Player.instance.team {
-            if self.clueTextField.isFirstResponder() || self.numberOfWordsTextField.isFirstResponder() {
+            if self.cluegiverIsEditing {
                 return  // Cluegiver is editing the clue/number of words
             }
             

    
    private var buttonAnimationStarted = false
    private var textFieldAnimationStarted = false
    
    private var broadcastTimer: NSTimer?
    private var refreshTimer: NSTimer?

    func textFieldDidBeginEditing(textField: UITextField) {
        self.stopTextFieldAnimations()
        
        self.cluegiverIsEditing = true
        
        if textField == self.clueTextField {
            if textField.text == Round.defaultClueGiverClue {
                textField.text = ""
