diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
index b3172f5e3..ee1d21034 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
@@ -438,7 +438,6 @@ public class MapView extends FrameLayout implements LocationListener {
         marker.setId(id);        // the annotation needs to know its id
         marker.setMapView(this); // the annotation needs to know which map view it is in
         mAnnotations.add(marker);
-        selectAnnotation(marker);
         return marker;
     }
 
@@ -1968,8 +1967,21 @@ public class MapView extends FrameLayout implements LocationListener {
 
     private void selectAnnotation(Annotation annotation) {
 
-        // Need to deselect any currently selected annotation first
+        if (annotation == null) {
+            return;
+        }
 
+        if (annotation == mSelectedAnnotation) {
+            return;
+        }
+
+        if (annotation instanceof Marker) {
+            // Need to deselect any currently selected annotation first
+            deselectAnnotation();
+
+            ((Marker)annotation).showInfoWindow();
+            mSelectedAnnotation = annotation;
+        }
     }
 
     private void deselectAnnotation() {
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
index de52a31a4..eb5bfbc28 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
@@ -122,7 +122,7 @@ public class MainActivity extends AppCompatActivity {
                         .position(position)
                         .title("Dropped Pin")
                         .snippet("Some snippet text.")
-                        .sprite("default_marker")).showInfoWindow();
+                        .sprite("default_marker"));
             }
         });