     }
 
     @IBAction func cancelButtonTapped(_ sender: AnyObject) {
+        self.dismissKeyboard()
         self.delegate?.editBabyViewController(self, didFinishWithBaby: nil)
         
         // Delete temp image if any

        
        return true
    }


    // MARK: - Actions

    // MARK: - UIScrollViewDelegate

    func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
        self.dismissKeyboard()
        
        if visiblePickerIndexPath != nil {
            let dateCell: DatePickerCell = tableView.cellForRow(at: self.visiblePickerIndexPath!) as! DatePickerCell
