diff --git a/js/components/global-search.js b/js/components/global-search.js
index a8fa69e6a..d6a87cbce 100644
--- a/js/components/global-search.js
+++ b/js/components/global-search.js
@@ -31,6 +31,7 @@ $(function()
 		css_classes:
 		{
 			opened: 'ibo-is-opened',
+			hidden: 'ibo-is-hidden',
 		},
 		js_selectors:
 		{
@@ -143,11 +144,14 @@ $(function()
 		},
 		_openDrawer: function()
 		{
+			this.element.find(this.js_selectors.compartment_element).removeClass(this.css_classes.hidden);
 			this.element.addClass(this.css_classes.opened);
 		},
 		_closeDrawer: function()
 		{
 			this.element.removeClass(this.css_classes.opened);
+			//Note: Elements are hidden to avoid having the keyboard navigation "TAB" passing throught them when they are not displayed
+			this.element.find(this.js_selectors.compartment_element).addClass(this.css_classes.hidden);
 		},
 		_setFocusOnInput: function()
 		{
diff --git a/js/components/quick-create.js b/js/components/quick-create.js
index bfb1429e1..de2400b64 100644
--- a/js/components/quick-create.js
+++ b/js/components/quick-create.js
@@ -165,7 +165,7 @@ $(function()
 		{
 			this.element.removeClass(this.css_classes.opened);
 			//Note: Elements are hidden to avoid having the keyboard navigation "TAB" passing throught them when they are not displayed
-			this.element.find(this.js_selectors.compartment_element).addClass(this.css_classes.hidden)
+			this.element.find(this.js_selectors.compartment_element).addClass(this.css_classes.hidden);
 		},
 		_setFocusOnInput: function()
 		{