diff --git a/client/modules/IDE/components/Searchbar.jsx b/client/modules/IDE/components/Searchbar.jsx
index 4f5f350e..771bdf82 100644
--- a/client/modules/IDE/components/Searchbar.jsx
+++ b/client/modules/IDE/components/Searchbar.jsx
@@ -46,7 +46,7 @@ class Searchbar extends React.Component {
   render() {
     const { searchValue } = this.state;
     return (
-      <div className="searchbar">
+      <div className={`searchbar ${searchValue === '' ? 'searchbar--is-empty' : ''}`}>
         <button
           type="submit"
           className="searchbar__button"
diff --git a/client/styles/components/_searchbar.scss b/client/styles/components/_searchbar.scss
index 62156743..93e9bbe9 100644
--- a/client/styles/components/_searchbar.scss
+++ b/client/styles/components/_searchbar.scss
@@ -68,3 +68,7 @@ button[type="submit"].searchbar__button {
     }
   }
 }
+
+.searchbar--is-empty .searchbar__clear-button {
+  display: none;
+}