             inputAccessoryViewType = nil
         }
 
-        // TODO: figure out how to animate this better. See gif here https://wikimedia.slack.com/archives/D7HH4J9CZ/p1544568250021700 to see how the toolbar is appearing too soon.
-        dispatchOnMainQueue() { // Prevents flicker.
-            UIView.performWithoutAnimation {
-                self.resignFirstResponder()
-                self.becomeFirstResponder()
-            }
-        }
-
         inputViewType = type
+        
+        reloadInputViews()
     }
 }
 
 extension SectionEditorWebViewWithEditToolbar: DefaultEditToolbarViewDelegate {
     func defaultEditToolbarViewDidTapTextFormattingButton(_ defaultEditToolbarView: DefaultEditToolbarView, button: UIButton) {
-        self.setInputViewHidden(type: .textFormatting, hidden: false)
+        setInputViewHidden(type: .textFormatting, hidden: false)
     }
 
     func defaultEditToolbarViewDidTapHeaderFormattingButton(_ defaultEditToolbarView: DefaultEditToolbarView, button: UIButton) {

    // MARK: Swizzling input accessory view

    func configureInputAccessoryViews() {
        _ = setInputAccessoryViews
    }

    private var previousInputAccessoryViewType: InputAccessoryViewType?
    private var inputAccessoryViewType: InputAccessoryViewType? = .default {
        didSet {
            previousInputAccessoryViewType = oldValue
        }
    }

    private struct InputAccessoryViewKey {
        static var Default = "wmf_AssociatedDefaultEditToolbarView"
        static var Highlight = "wmf_AssociatedHighlightEditToolbarView"
    }

    private enum InputAccessoryViewType {

        case highlight
    }

    private func preferredInputAccessoryView() -> (UIView & Themeable)? {
        guard let inputAccessoryViewType = inputAccessoryViewType else {
            return nil
        }

