diff --git a/src/css/easymde.css b/src/css/easymde.css
index 96805e5..46305e5 100644
--- a/src/css/easymde.css
+++ b/src/css/easymde.css
@@ -323,7 +323,7 @@
     position: absolute;
     background-color: #f9f9f9;
     box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-    padding: 8px 8px;
+    padding: 8px;
     z-index: 2;
 }
 
diff --git a/src/js/easymde.js b/src/js/easymde.js
index 5fdd25e..cabc8ce 100644
--- a/src/js/easymde.js
+++ b/src/js/easymde.js
@@ -114,7 +114,7 @@ function fixShortcut(name) {
  * Create dropdown block
  */
 function createToolbarDropdown(options, enableTooltips, shortcuts, parent) {
-    var el = createToolbarButton(options, enableTooltips, shortcuts, 'div');
+    var el = createToolbarButton(options, enableTooltips, shortcuts, 'div', parent);
     el.className += ' easymde-dropdown';
     var content = document.createElement('div');
     content.className = 'easymde-dropdown-content';
@@ -2282,12 +2282,10 @@ EasyMDE.prototype.createToolbar = function (items) {
             var el;
             if (item === '|') {
                 el = createSep();
+            } else if (item.children) {
+                el = createToolbarDropdown(item, self.options.toolbarTips, self.options.shortcuts, self);
             } else {
-                if (item.children) {
-                    el = createToolbarDropdown(item, self.options.toolbarTips, self.options.shortcuts, self);
-                } else {
-                    el = createToolbarButton(item, self.options.toolbarTips, self.options.shortcuts, 'button', self);
-                }
+                el = createToolbarButton(item, self.options.toolbarTips, self.options.shortcuts, 'button', self);
             }