         switch indexPath.row {
         case WordList.topCell.rawValue:
             // Top cell
-            SCStates.customCategoryWordListState = .nonEditing
+            break
         default:
             // Word cell
-            SCStates.customCategoryWordListState = .nonEditing
-
             let index = self.indexWithOffset(index: indexPath.row)
             self.customCategory.removeWordAtIndex(index: index)
         }
 
+        self.changeStateTo(state: .nonEditing, reload: false)
         self.hasFirstResponder = false
         self.reloadView()
     }

                    successHandler: { (name) in
                        self.customCategory.setName(name: name)

                        SCStates.customCategoryWordListState = .nonEditing
                        self.reloadView()
                    }
                )
            default:

            title: SCStrings.button.cancel.rawValue,
            style: .cancel,
            handler: { (action: UIAlertAction) in
                self.changeStateTo(state: .nonEditing, reload: false)
                alertController.dismiss(animated: false, completion: nil)
            }
        )
