diff --git a/frontend/src/components/toolbar/common-toolbar.js b/frontend/src/components/toolbar/common-toolbar.js
index b2cae201c9..a683ce67dc 100644
--- a/frontend/src/components/toolbar/common-toolbar.js
+++ b/frontend/src/components/toolbar/common-toolbar.js
@@ -13,12 +13,13 @@ const propTypes = {
 
 class  CommonToolbar extends React.Component {
   render() {
+    let searchPlaceholder = this.props.searchPlaceholder || 'Search Files'
     return (
       <div className="common-toolbar">
         {isPro && (
           <Search 
             repoID={this.props.repoID}
-            placeholder={gettext(this.props.searchPlaceholder)}
+            placeholder={gettext(searchPlaceholder)}
             onSearchedClick={this.props.onSearchedClick} 
           />
         )}
diff --git a/frontend/src/components/toolbar/general-toolbar.js b/frontend/src/components/toolbar/general-toolbar.js
index bbfe7b1990..1fb92fd018 100644
--- a/frontend/src/components/toolbar/general-toolbar.js
+++ b/frontend/src/components/toolbar/general-toolbar.js
@@ -13,7 +13,6 @@ class GeneralToolbar extends React.Component {
   render() {
     // todo get repoID?
     let { onShowSidePanel, onSearchedClick } = this.props;
-    let placeHolder = this.props.searchPlaceholder || 'Search files in this library';
     return (
       <div className="main-panel-north">
         <div className="cur-view-toolbar">
@@ -25,7 +24,7 @@ class GeneralToolbar extends React.Component {
         </div>
         <CommonToolbar 
           repoID={'todo'}
-          searchPlaceholder={placeHolder}
+          searchPlaceholder={this.props.searchPlaceholder}
           onSearchedClick={onSearchedClick} 
         />
       </div>
diff --git a/frontend/src/components/toolbar/groups-toolbar.js b/frontend/src/components/toolbar/groups-toolbar.js
index f6dbfacd2f..5f3e821c76 100644
--- a/frontend/src/components/toolbar/groups-toolbar.js
+++ b/frontend/src/components/toolbar/groups-toolbar.js
@@ -19,7 +19,6 @@ class GroupsToolbar extends React.Component {
 
   render() {
     let { onShowSidePanel, onSearchedClick } = this.props;
-    let placeHolder = this.props.searchPlaceholder || 'Search files in this library';
     return (
       <div className="main-panel-north">
         <div className="cur-view-toolbar">
@@ -32,7 +31,7 @@ class GroupsToolbar extends React.Component {
             className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none">
           </span>
         </div>
-        <CommonToolbar searchPlaceholder={placeHolder} onSearchedClick={onSearchedClick}/>
+        <CommonToolbar searchPlaceholder={this.props.searchPlaceholder} onSearchedClick={onSearchedClick}/>
       </div>
     );
   }
diff --git a/frontend/src/css/search.css b/frontend/src/css/search.css
index 0a41c13496..27d814a906 100644
--- a/frontend/src/css/search.css
+++ b/frontend/src/css/search.css
@@ -26,6 +26,7 @@
 
 .search-input {
   height: 1.875rem;
+  width: 15rem;
 }
 
 .search-result-container {