diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js
index fa52e35509b57dc1e5f1d06514566f8cc480bbe7..977ed5cc4dbf7c694157ede01a713d4b2f5b983e 100644
--- a/editors/demo/src/Editors.js
+++ b/editors/demo/src/Editors.js
@@ -54,7 +54,7 @@ const Editors = () => {
       case 'ncbi':
         break;
       default:
-        return <Editoria />;
+        return <HHMI />;
     }
   };
 
diff --git a/wax-prosemirror-components/src/components/ToolGroupComponent.js b/wax-prosemirror-components/src/components/ToolGroupComponent.js
index 361f3a49450a3e2620f0cb5364cebe751bb40bc7..48d71f905e8342ea3a6db0beaa10c43e35934a7b 100644
--- a/wax-prosemirror-components/src/components/ToolGroupComponent.js
+++ b/wax-prosemirror-components/src/components/ToolGroupComponent.js
@@ -36,8 +36,8 @@ const ToolGroupComponent = ({ view, tools, name }) => {
         {toolsShown}
         {rest.length > 0 && (
           <Dropdown
-            iconName="more"
             dropComponent={<DropWrapper>{rest}</DropWrapper>}
+            iconName="more"
             title="Show more tools"
           />
         )}
diff --git a/wax-prosemirror-components/src/components/ToolGroups.js b/wax-prosemirror-components/src/components/ToolGroups.js
index 374fb6f15a63edb7e272aa3b8e7b16b2334d0f81..0c60229d3d024b18836a55f7590f88db3f56c806 100644
--- a/wax-prosemirror-components/src/components/ToolGroups.js
+++ b/wax-prosemirror-components/src/components/ToolGroups.js
@@ -12,8 +12,8 @@ const ToolGroups = ({ toolGroups, view }) => {
     return (
       <ToolGroupComponent
         key={uuidv4()}
-        view={view}
         tools={toolGroup._tools}
+        view={view}
         // title={this.title}
         // name={name}
       />
diff --git a/wax-prosemirror-components/src/ui/buttons/Dropdown.js b/wax-prosemirror-components/src/ui/buttons/Dropdown.js
index 4dd6147fa36016dd9f4671666dda268f72406fd6..3085205fc08110fae72cb558ebf69314a2420d14 100644
--- a/wax-prosemirror-components/src/ui/buttons/Dropdown.js
+++ b/wax-prosemirror-components/src/ui/buttons/Dropdown.js
@@ -34,7 +34,10 @@ const Dropdown = props => {
         disabled={disabled}
         iconName={iconName}
         label={label}
-        onMouseDown={() => setIsOpen(!isOpen)}
+        onMouseDown={event => {
+          event.preventDefault();
+          setIsOpen(!isOpen);
+        }}
         title={title}
       />