diff --git a/types/google-maps-react/google-maps-react-tests.tsx b/types/google-maps-react/google-maps-react-tests.tsx
index d4fb63af18..00b8946c1a 100644
--- a/types/google-maps-react/google-maps-react-tests.tsx
+++ b/types/google-maps-react/google-maps-react-tests.tsx
@@ -1,4 +1,4 @@
-import { GoogleAPI, Map, Marker, MapProps, GoogleApiWrapper } from 'google-maps-react';
+import { GoogleAPI, Map, Marker, MapProps, GoogleApiWrapper, InfoWindow } from 'google-maps-react';
 import * as React from 'react';
 
 interface Location {
@@ -56,7 +56,11 @@ class MapContainer extends React.Component<Props> {
         position={ hit._geoloc }
         title={ hit.title }
         key={ hit.id }
-      />;
+      >
+        <InfoWindow>
+          <p>Test</p>
+        </InfoWindow>
+      </Marker>;
     });
   }
 }
diff --git a/types/google-maps-react/index.d.ts b/types/google-maps-react/index.d.ts
index a22f43eae7..c3acfff702 100644
--- a/types/google-maps-react/index.d.ts
+++ b/types/google-maps-react/index.d.ts
@@ -2,8 +2,9 @@
 // Project: https://github.com/fullstackreact/google-maps-react#readme
 // Definitions by: Gordon Burgett <https://github.com/gburgett>
 //                 Justin Powell <https://github.com/jpowell>
+//                 Paito Anderson <https://github.com/PaitoAnderson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.0
 
 import 'googlemaps';
 import * as React from 'react';
@@ -103,12 +104,15 @@ export class HeatMap extends React.Component<any, any> {
 }
 
 export interface InfoWindowProps extends Partial<google.maps.InfoWindowOptions> {
-  google: typeof google;
-  map: google.maps.Map;
-  marker: google.maps.Marker;
+  google?: typeof google;
+  map?: google.maps.Map;
+  marker?: google.maps.Marker;
 
   mapCenter?: google.maps.LatLng | google.maps.LatLngLiteral;
   visible?: boolean;
+
+  onOpen?: () => void;
+  onClose?: () => void;
 }
 
 export class InfoWindow<P extends InfoWindowProps = InfoWindowProps, S = any> extends React.Component<P, S> {