diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bf6bd2f9da..fe6f0bd9a54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 **Bug fixes**
 
 - Set `EuiFlexGroup` to `flex-grow: 1` to be more friendly with IE11 [(#315)](https://github.com/elastic/eui/pull/315)
+- Fix TypeScript definitions such that optional and readonly properties survive being passed through `Omit` [(#322)](https://github.com/elastic/eui/pull/322)
 
 # [`0.0.13`](https://github.com/elastic/eui/tree/v0.0.13)
 
diff --git a/src/components/common.d.ts b/src/components/common.d.ts
index b33923198f3..421701062ec 100644
--- a/src/components/common.d.ts
+++ b/src/components/common.d.ts
@@ -18,5 +18,5 @@ declare module '@elastic/eui' {
   type Diff<T extends string, U extends string> = ({ [P in T]: P } &
     { [P in U]: never } & { [x: string]: never })[T];
 
-  type Omit<T, K extends keyof T> = { [P in Diff<keyof T, K>]: T[P] };
+  type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
 }
diff --git a/src/components/context_menu/index.d.ts b/src/components/context_menu/index.d.ts
index bde99cac903..c1d716701c2 100644
--- a/src/components/context_menu/index.d.ts
+++ b/src/components/context_menu/index.d.ts
@@ -90,13 +90,11 @@ declare module '@elastic/eui' {
     content?: React.ReactNode;
   }
 
-  export interface EuiContextMenuProps {
-    panels?: EuiContextMenuPanelDescriptor[];
-    initialPanelId?: EuiContextMenuPanelId;
-  }
+  export type EuiContextMenuProps = CommonProps &
+    Omit<HTMLAttributes<HTMLDivElement>, 'style'> & {
+      panels?: EuiContextMenuPanelDescriptor[];
+      initialPanelId?: EuiContextMenuPanelId;
+    };
 
-  export const EuiContextMenu: SFC<
-    Omit<HTMLAttributes<HTMLDivElement>, 'className' | 'style'> &
-      EuiContextMenuProps
-  >;
+  export const EuiContextMenu: SFC<EuiContextMenuProps>;
 }