Merge "Fix dropdown tap on touch device"
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
index d9561cb..b795d64 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
@@ -580,7 +580,11 @@
     },
 
     _handleFileTap: function(e) {
-      this.$.dropdown.close();
+      // async is needed so that that the click event is fired before the
+      // dropdown closes (This was a bug for touch devices).
+      this.async(function() {
+        this.$.dropdown.close();
+      }, 1);
     },
 
     _handleMobileSelectChange: function(e) {
diff --git a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.js b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.js
index 6ab1301..9b87f03 100644
--- a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.js
+++ b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.js
@@ -63,7 +63,11 @@
     },
 
     _handleDropdownTap: function(e) {
-      this.$.dropdown.close();
+      // async is needed so that that the click event is fired before the
+      // dropdown closes (This was a bug for touch devices).
+      this.async(function() {
+        this.$.dropdown.close();
+      }, 1);
     },
 
     _showDropdownTapHandler: function(e) {