diff --git a/src/core/client/ui/components/BaseButton/BaseButton.tsx b/src/core/client/ui/components/BaseButton/BaseButton.tsx
index fd349182b..39ed4cd48 100644
--- a/src/core/client/ui/components/BaseButton/BaseButton.tsx
+++ b/src/core/client/ui/components/BaseButton/BaseButton.tsx
@@ -1,5 +1,11 @@
 import cn from "classnames";
-import React, { EventHandler, FocusEvent, MouseEvent, Ref } from "react";
+import React, {
+  EventHandler,
+  FocusEvent,
+  MouseEvent,
+  Ref,
+  TouchEvent,
+} from "react";
 import { ButtonHTMLAttributes, StatelessComponent } from "react";
 
 import {
@@ -24,20 +30,22 @@ interface InnerProps extends ButtonHTMLAttributes<HTMLButtonElement> {
    */
   classes: typeof styles;
 
-  /** This is passed by the `withKeyboardFocus` HOC */
-  keyboardFocus: boolean;
-
-  /** This is passed by the `withMouseHover` HOC */
-  mouseHover?: boolean;
-
   /** Internal: Forwarded Ref */
   forwardRef?: Ref<HTMLButtonElement>;
 
   type?: "submit" | "reset" | "button";
 
+  // These handlers are passed down by the `withMouseHover` HOC.
+  mouseHover: boolean;
+  onMouseOver: React.EventHandler<MouseEvent<HTMLElement>>;
+  onMouseOut: React.EventHandler<MouseEvent<HTMLElement>>;
+  onTouchEnd: React.EventHandler<TouchEvent<HTMLElement>>;
+
+  // These handlers are passed down by the `withKeyboardFocus` HOC.
   onFocus: EventHandler<FocusEvent<HTMLElement>>;
   onBlur: EventHandler<FocusEvent<HTMLElement>>;
   onMouseDown: EventHandler<MouseEvent<HTMLElement>>;
+  keyboardFocus: boolean;
 }
 
 /**
diff --git a/src/core/client/ui/components/SelectField/SelectField.tsx b/src/core/client/ui/components/SelectField/SelectField.tsx
index 5c9bfdc74..64e595092 100644
--- a/src/core/client/ui/components/SelectField/SelectField.tsx
+++ b/src/core/client/ui/components/SelectField/SelectField.tsx
@@ -13,35 +13,36 @@ import Icon from "../Icon";
 import * as styles from "./SelectField.css";
 
 export interface SelectFieldProps {
-  id?: string;
-  autofocus?: boolean;
-  /**
-   * Name
-   */
-  name?: string;
   /**
    * Value that has been selected.
    */
   value?: string;
+
   /**
    * Convenient prop to override the root styling.
    */
   className?: string;
+
   /**
    * Override or extend the styles applied to the component.
    */
   classes: typeof styles;
+
   /*
   * If set renders a full width button
   */
   fullWidth?: boolean;
 
+  id?: string;
+  autofocus?: boolean;
+  name?: string;
   onChange?: EventHandler<ChangeEvent<HTMLSelectElement>>;
+  disabled?: boolean;
+
+  // These handlers are passed down by the `withKeyboardFocus` HOC.
   onFocus: EventHandler<FocusEvent<HTMLSelectElement>>;
   onBlur: EventHandler<FocusEvent<HTMLSelectElement>>;
   onMouseDown: EventHandler<MouseEvent<HTMLSelectElement>>;
-
-  disabled?: boolean;
   keyboardFocus: boolean;
 }