diff --git a/HISTORY.md b/HISTORY.md
index ed26667d..f6bb7f8a 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -2,6 +2,7 @@ v4.0.0
 ==================
 * rebuild of the px-dropdown component using iron-dropdown and iron-selector
 * added new icons
+* code review fixes
 
 v3.1.1
 ==================
diff --git a/px-dropdown.html b/px-dropdown.html
index caefa01f..e0279dc2 100644
--- a/px-dropdown.html
+++ b/px-dropdown.html
@@ -60,7 +60,7 @@
       target="[[_keyBindingsTarget]]"
       on-keys-pressed="_handleKeyPress">
     </iron-a11y-keys>
-    <button id="button" class$="btn dropdown-trigger {{_getDisabledClass(disabled)}} {{_getClass(buttonStyle)}}" on-tap="toggle">
+    <div id="button" class$="btn dropdown-trigger {{_getDisabledClass(disabled)}} {{_getClass(buttonStyle)}}" on-tap="toggle">
       <div id="label" title="{{_displayValueSelected}}" class="dropdown-label">{{_displayValueSelected}}</div>
       <template is="dom-if" if="{{_showClearButton(opened,selected,selectedValues,selectedValues.*)}}">
         <iron-icon class="dropdown-icon" icon="px:close" on-tap="_clear"></iron-icon>
@@ -68,7 +68,7 @@
       <template is="dom-if" if="{{_showChevron(hideChevron,opened,selected,selectedValues,selectedValues.*)}}">
         <iron-icon class="dropdown-icon" icon="px:chevron-down"></iron-icon>
       </template>
-    </button>
+    </div>
     <iron-dropdown
       id="dropdown"
       class="dropdown"