diff --git a/package-lock.json b/package-lock.json
index 70f9bec..53c54f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -775,7 +775,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1190,7 +1191,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -1246,6 +1248,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -1289,12 +1292,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -2557,11 +2562,6 @@
         "webidl-conversions": "^4.0.2"
       }
     },
-    "wicg-inert": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-2.2.1.tgz",
-      "integrity": "sha512-xaI3ig1hhEcec2+5uUs9i2BrVXzJ83dOn2ij3ze2RAKUQ4X03Cm99SLny1Vh1KL4Rc1SPZnQOs0mdtVkQ0Tclw=="
-    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
diff --git a/package.json b/package.json
index 2a3389b..346d55f 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,6 @@
     "test": "stencil test --spec --e2e",
     "test.watch": "stencil test --spec --e2e --watchAll"
   },
-  "dependencies": {
-    "wicg-inert": "^2.1.2"
-  },
   "devDependencies": {
     "@stencil/core": "~0.16.2"
   },
diff --git a/src/assets/inert.min.js b/src/assets/inert.min.js
new file mode 100644
index 0000000..9a70caf
--- /dev/null
+++ b/src/assets/inert.min.js
@@ -0,0 +1,2 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define("inert",t):t()}(0,function(){"use strict";var e=function(){function i(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(e,t,n){return t&&i(e.prototype,t),n&&i(e,n),e}}();function i(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=Array.prototype.slice,r=Element.prototype.matches||Element.prototype.msMatchesSelector,s=["a[href]","area[href]","input:not([disabled])","select:not([disabled])","textarea:not([disabled])","button:not([disabled])","iframe","object","embed","[contenteditable]"].join(","),a=function(){function n(e,t){i(this,n),this._inertManager=t,this._rootElement=e,this._managedNodes=new Set,this._rootElement.hasAttribute("aria-hidden")?this._savedAriaHidden=this._rootElement.getAttribute("aria-hidden"):this._savedAriaHidden=null,this._rootElement.setAttribute("aria-hidden","true"),this._makeSubtreeUnfocusable(this._rootElement),this._observer=new MutationObserver(this._onMutation.bind(this)),this._observer.observe(this._rootElement,{attributes:!0,childList:!0,subtree:!0})}return e(n,[{key:"destructor",value:function(){this._observer.disconnect(),this._rootElement&&(null!==this._savedAriaHidden?this._rootElement.setAttribute("aria-hidden",this._savedAriaHidden):this._rootElement.removeAttribute("aria-hidden")),this._managedNodes.forEach(function(e){this._unmanageNode(e.node)},this),this._observer=null,this._rootElement=null,this._managedNodes=null,this._inertManager=null}},{key:"_makeSubtreeUnfocusable",value:function(e){var t=this;l(e,function(e){return t._visitNode(e)});var n=document.activeElement;if(!document.body.contains(e)){for(var i=e,o=void 0;i;){if(i.nodeType===Node.DOCUMENT_FRAGMENT_NODE){o=i;break}i=i.parentNode}o&&(n=o.activeElement)}e.contains(n)&&(n.blur(),n===document.activeElement&&document.body.focus())}},{key:"_visitNode",value:function(e){if(e.nodeType===Node.ELEMENT_NODE){var t=e;t!==this._rootElement&&t.hasAttribute("inert")&&this._adoptInertRoot(t),(r.call(t,s)||t.hasAttribute("tabindex"))&&this._manageNode(t)}}},{key:"_manageNode",value:function(e){var t=this._inertManager.register(e,this);this._managedNodes.add(t)}},{key:"_unmanageNode",value:function(e){var t=this._inertManager.deregister(e,this);t&&this._managedNodes.delete(t)}},{key:"_unmanageSubtree",value:function(e){var t=this;l(e,function(e){return t._unmanageNode(e)})}},{key:"_adoptInertRoot",value:function(e){var t=this._inertManager.getInertRoot(e);t||(this._inertManager.setInert(e,!0),t=this._inertManager.getInertRoot(e)),t.managedNodes.forEach(function(e){this._manageNode(e.node)},this)}},{key:"_onMutation",value:function(e,t){e.forEach(function(e){var t=e.target;if("childList"===e.type)o.call(e.addedNodes).forEach(function(e){this._makeSubtreeUnfocusable(e)},this),o.call(e.removedNodes).forEach(function(e){this._unmanageSubtree(e)},this);else if("attributes"===e.type)if("tabindex"===e.attributeName)this._manageNode(t);else if(t!==this._rootElement&&"inert"===e.attributeName&&t.hasAttribute("inert")){this._adoptInertRoot(t);var n=this._inertManager.getInertRoot(t);this._managedNodes.forEach(function(e){t.contains(e.node)&&n._manageNode(e.node)})}},this)}},{key:"managedNodes",get:function(){return new Set(this._managedNodes)}},{key:"hasSavedAriaHidden",get:function(){return null!==this._savedAriaHidden}},{key:"savedAriaHidden",set:function(e){this._savedAriaHidden=e},get:function(){return this._savedAriaHidden}}]),n}(),d=function(){function n(e,t){i(this,n),this._node=e,this._overrodeFocusMethod=!1,this._inertRoots=new Set([t]),this._savedTabIndex=null,this._destroyed=!1,this.ensureUntabbable()}return e(n,[{key:"destructor",value:function(){if(this._throwIfDestroyed(),this._node&&this._node.nodeType===Node.ELEMENT_NODE){var e=this._node;null!==this._savedTabIndex?e.setAttribute("tabindex",this._savedTabIndex):e.removeAttribute("tabindex"),this._overrodeFocusMethod&&delete e.focus}this._node=null,this._inertRoots=null,this._destroyed=!0}},{key:"_throwIfDestroyed",value:function(){if(this.destroyed)throw new Error("Trying to access destroyed InertNode")}},{key:"ensureUntabbable",value:function(){if(this.node.nodeType===Node.ELEMENT_NODE){var e=this.node;if(r.call(e,s)){if(-1===e.tabIndex&&this.hasSavedTabIndex)return;e.hasAttribute("tabindex")&&(this._savedTabIndex=e.tabIndex),e.setAttribute("tabindex","-1"),e.nodeType===Node.ELEMENT_NODE&&(e.focus=function(){},this._overrodeFocusMethod=!0)}else e.hasAttribute("tabindex")&&(this._savedTabIndex=e.tabIndex,e.removeAttribute("tabindex"))}}},{key:"addInertRoot",value:function(e){this._throwIfDestroyed(),this._inertRoots.add(e)}},{key:"removeInertRoot",value:function(e){this._throwIfDestroyed(),this._inertRoots.delete(e),0===this._inertRoots.size&&this.destructor()}},{key:"destroyed",get:function(){return this._destroyed}},{key:"hasSavedTabIndex",get:function(){return null!==this._savedTabIndex}},{key:"node",get:function(){return this._throwIfDestroyed(),this._node}},{key:"savedTabIndex",set:function(e){this._throwIfDestroyed(),this._savedTabIndex=e},get:function(){return this._throwIfDestroyed(),this._savedTabIndex}}]),n}();function l(e,t,n){if(e.nodeType==Node.ELEMENT_NODE){var i=e;t&&t(i);var o=i.shadowRoot;if(o)return void l(o,t,o);if("content"==i.localName){for(var r=i,s=r.getDistributedNodes?r.getDistributedNodes():[],a=0;a<s.length;a++)l(s[a],t,n);return}if("slot"==i.localName){for(var d=i,u=d.assignedNodes?d.assignedNodes({flatten:!0}):[],h=0;h<u.length;h++)l(u[h],t,n);return}}for(var c=e.firstChild;null!=c;)l(c,t,n),c=c.nextSibling}function u(e){if(!e.querySelector("style#inert-style")){var t=document.createElement("style");t.setAttribute("id","inert-style"),t.textContent="\n[inert] {\n  pointer-events: none;\n  cursor: default;\n}\n\n[inert], [inert] * {\n  user-select: none;\n  -webkit-user-select: none;\n  -moz-user-select: none;\n  -ms-user-select: none;\n}\n",e.appendChild(t)}}var t=new(function(){function t(e){if(i(this,t),!e)throw new Error("Missing required argument; InertManager needs to wrap a document.");this._document=e,this._managedNodes=new Map,this._inertRoots=new Map,this._observer=new MutationObserver(this._watchForInert.bind(this)),u(e.head||e.body||e.documentElement),"loading"===e.readyState?e.addEventListener("DOMContentLoaded",this._onDocumentLoaded.bind(this)):this._onDocumentLoaded()}return e(t,[{key:"setInert",value:function(e,t){if(t){if(this._inertRoots.has(e))return;var n=new a(e,this);if(e.setAttribute("inert",""),this._inertRoots.set(e,n),!this._document.body.contains(e))for(var i=e.parentNode;i;)11===i.nodeType&&u(i),i=i.parentNode}else{if(!this._inertRoots.has(e))return;this._inertRoots.get(e).destructor(),this._inertRoots.delete(e),e.removeAttribute("inert")}}},{key:"getInertRoot",value:function(e){return this._inertRoots.get(e)}},{key:"register",value:function(e,t){var n=this._managedNodes.get(e);return void 0!==n?n.addInertRoot(t):n=new d(e,t),this._managedNodes.set(e,n),n}},{key:"deregister",value:function(e,t){var n=this._managedNodes.get(e);return n?(n.removeInertRoot(t),n.destroyed&&this._managedNodes.delete(e),n):null}},{key:"_onDocumentLoaded",value:function(){o.call(this._document.querySelectorAll("[inert]")).forEach(function(e){this.setInert(e,!0)},this),this._observer.observe(this._document.body,{attributes:!0,subtree:!0,childList:!0})}},{key:"_watchForInert",value:function(e,t){var i=this;e.forEach(function(e){switch(e.type){case"childList":o.call(e.addedNodes).forEach(function(e){if(e.nodeType===Node.ELEMENT_NODE){var t=o.call(e.querySelectorAll("[inert]"));r.call(e,"[inert]")&&t.unshift(e),t.forEach(function(e){this.setInert(e,!0)},i)}},i);break;case"attributes":if("inert"!==e.attributeName)return;var t=e.target,n=t.hasAttribute("inert");i.setInert(t,n)}},this)}}]),t}())(document);Element.prototype.hasOwnProperty("inert")||Object.defineProperty(Element.prototype,"inert",{enumerable:!0,get:function(){return this.hasAttribute("inert")},set:function(e){t.setInert(this,e)}})});
+//# sourceMappingURL=inert.min.js.map
diff --git a/src/components/combo-noinput/combo-noinput.tsx b/src/components/combo-noinput/combo-noinput.tsx
index f11391f..32f4045 100644
--- a/src/components/combo-noinput/combo-noinput.tsx
+++ b/src/components/combo-noinput/combo-noinput.tsx
@@ -45,6 +45,9 @@ export class ComboNoInput {
   // Unique ID that should really use a UUID library instead
   private htmlId = uniqueId();
 
+  // Prevent menu closing before click completed
+  private ignoreBlur = false;
+
   // save reference to input element
   private inputRef: HTMLElement;
 
@@ -92,6 +95,7 @@ export class ComboNoInput {
                   event.stopPropagation();
                   this.onOptionClick(i);
                 }}
+                onMouseDown={this.onOptionMouseDown.bind(this)}
               >{option.name}</div>
             );
           })}
@@ -126,6 +130,11 @@ export class ComboNoInput {
   }
 
   private onComboBlur() {
+    if (this.ignoreBlur) {
+      this.ignoreBlur = false;
+      return;
+    }
+
     this.updateMenuState(false, false);
   }
 
@@ -139,6 +148,10 @@ export class ComboNoInput {
     this.updateMenuState(false);
   }
 
+  private onOptionMouseDown() {
+    this.ignoreBlur = true;
+  }
+
   private selectOption(index: number) {
     const selected = this.options[index];
     this.value = selected.name;
diff --git a/src/components/modal/modal.tsx b/src/components/modal/modal.tsx
index 77f0f4e..7426fe5 100644
--- a/src/components/modal/modal.tsx
+++ b/src/components/modal/modal.tsx
@@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/
 
 import { Component, Event, EventEmitter, Prop, Watch } from '@stencil/core';
-import 'wicg-inert';
+// import 'wicg-inert';
 
 @Component({
   tag: 'sui-modal',
diff --git a/src/components/multiselect-inline/multiselect-inline.tsx b/src/components/multiselect-inline/multiselect-inline.tsx
index 529a8ef..2b071dc 100644
--- a/src/components/multiselect-inline/multiselect-inline.tsx
+++ b/src/components/multiselect-inline/multiselect-inline.tsx
@@ -111,7 +111,7 @@ export class MultiselectInline {
             {selectedOptions.map((option, i) => {
               return (
                 <li>
-                  <button class="remove-option" aria-describedby={`${htmlId}-remove`} onClick={() => { this.removeOption(i); }}>
+                  <button type="button" class="remove-option" aria-describedby={`${htmlId}-remove`} onClick={() => { this.removeOption(i); }}>
                     {option.name}
                     <span class="remove-icon" aria-hidden="true">x</span>
                   </button>
diff --git a/src/index.html b/src/index.html
index dc446df..4fbe4ed 100644
--- a/src/index.html
+++ b/src/index.html
@@ -5,6 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=5.0">
   <title>Stencil Component Starter</title>
   <script src="/build/caiacc.js"></script>
+  <script src="./assets/inert.min.js"></script>
   <style type="text/css" src="/build/style.css"></style>
   <style type="text/css">
   .fruit-select,
diff --git a/src/shared/combo-base.css b/src/shared/combo-base.css
index 48c3746..939ee75 100644
--- a/src/shared/combo-base.css
+++ b/src/shared/combo-base.css
@@ -160,12 +160,13 @@ select.combo-input {
   border: 2px solid rgba(0,0,0,.42);
   border-radius: 4px;
   display: flex;
+  flex-wrap: wrap;
   min-height: calc(1.4em + 26px);
   padding: 12px 16px 14px;
 }
 
 .multiselect-inline .selected-options {
-  flex: 0 0 auto;
+  flex: 0 1 auto;
 }
 
 .multiselect-inline .selected-options li {
@@ -174,7 +175,7 @@ select.combo-input {
 
 .multiselect-inline .combo-input {
   border: none;
-  flex: 1 1 auto;
+  flex: 1 1 35%;
   min-height: calc(1.4em - 2px);
   padding: 0;
 }
diff --git a/src/studies/grid/actions.html b/src/studies/grid/actions.html
index 8164565..8b0d4ff 100644
--- a/src/studies/grid/actions.html
+++ b/src/studies/grid/actions.html
@@ -6,6 +6,7 @@
   <title>Grid Usability Study</title>
   <link rel="stylesheet" href="../../style.css"></style>
   <script src="/build/caiacc.js"></script>
+  <script src="./assets/inert.min.js"></script>
 </head>
 <body>
   <div role="main" class="main">
diff --git a/src/studies/grid/editable.html b/src/studies/grid/editable.html
index 1509f28..2d194d6 100644
--- a/src/studies/grid/editable.html
+++ b/src/studies/grid/editable.html
@@ -6,6 +6,7 @@
   <title>Grid Usability Study</title>
   <link rel="stylesheet" href="../../style.css"></style>
   <script src="/build/caiacc.js"></script>
+  <script src="./assets/inert.min.js"></script>
 </head>
 <body>
   <div role="main" class="main">
diff --git a/src/studies/grid/fast-editable.html b/src/studies/grid/fast-editable.html
index 9b9cef4..e7a3a0c 100644
--- a/src/studies/grid/fast-editable.html
+++ b/src/studies/grid/fast-editable.html
@@ -6,6 +6,7 @@
   <title>Grid Usability Study</title>
   <link rel="stylesheet" href="../../style.css"></style>
   <script src="/build/caiacc.js"></script>
+  <script src="./assets/inert.min.js"></script>
 </head>
 <body>
   <div role="main" class="main">
diff --git a/src/studies/grid/selection-aria.html b/src/studies/grid/selection-aria.html
index d4ecffc..e69e548 100644
--- a/src/studies/grid/selection-aria.html
+++ b/src/studies/grid/selection-aria.html
@@ -6,6 +6,7 @@
   <title>Grid Usability Study</title>
   <link rel="stylesheet" href="../../style.css"></style>
   <script src="/build/caiacc.js"></script>
+  <script src="./assets/inert.min.js"></script>
 </head>
 <body>
   <div role="main" class="main">
diff --git a/src/studies/grid/selection-checks.html b/src/studies/grid/selection-checks.html
index 683c8db..98b66e6 100644
--- a/src/studies/grid/selection-checks.html
+++ b/src/studies/grid/selection-checks.html
@@ -6,6 +6,7 @@
   <title>Grid Usability Study</title>
   <link rel="stylesheet" href="../../style.css"></style>
   <script src="/build/caiacc.js"></script>
+  <script src="./assets/inert.min.js"></script>
 </head>
 <body>
   <div role="main" class="main">
diff --git a/src/studies/grid/simple-actions.html b/src/studies/grid/simple-actions.html
index 4b36988..c71db85 100644
--- a/src/studies/grid/simple-actions.html
+++ b/src/studies/grid/simple-actions.html
@@ -6,6 +6,7 @@
   <title>Grid Usability Study</title>
   <link rel="stylesheet" href="../../style.css"></style>
   <script src="/build/caiacc.js"></script>
+  <script src="./assets/inert.min.js"></script>
 </head>
 <body>
   <div role="main" class="main">
diff --git a/src/studies/modal/confirm-modal.html b/src/studies/modal/confirm-modal.html
index 69cf8eb..35fa21d 100644
--- a/src/studies/modal/confirm-modal.html
+++ b/src/studies/modal/confirm-modal.html
@@ -6,7 +6,8 @@
   <title>Modal Dialog Usability Study</title>
   <link rel="stylesheet" href="../../style.css"></style>
   <link rel="stylesheet" href="./forms.css"></style>
-  <script src="/build/caiacc.js"></script>  
+  <script src="/build/caiacc.js"></script>
+  <script src="./assets/inert.min.js"></script>
 </head>
 <body>
   <div role="main" class="main example-form">
diff --git a/src/studies/modal/form-modal.html b/src/studies/modal/form-modal.html
index f773068..544171c 100644
--- a/src/studies/modal/form-modal.html
+++ b/src/studies/modal/form-modal.html
@@ -6,7 +6,8 @@
   <title>Modal Dialog Usability Study</title>
   <link rel="stylesheet" href="../../style.css"></style>
   <link rel="stylesheet" href="./forms.css"></style>
-  <script src="/build/caiacc.js"></script>  
+  <script src="/build/caiacc.js"></script>
+  <script src="./assets/inert.min.js"></script>
 </head>
 <body>
   <div role="main" class="main example-form">