diff --git a/x-pack/legacy/plugins/code/public/components/main/main.scss b/x-pack/legacy/plugins/code/public/components/main/main.scss
index c633337d7e54b..23eb111981a8a 100644
--- a/x-pack/legacy/plugins/code/public/components/main/main.scss
+++ b/x-pack/legacy/plugins/code/public/components/main/main.scss
@@ -165,18 +165,18 @@
 
 .codeSearch-suggestion--inner {
   display: flex;
-  align-items: stretch;
   flex-grow: 1;
   align-items: center;
   white-space: nowrap;
 }
 
+.codeSearch__suggestionTextContainer {
+  min-width: 0;
+  flex: 1;
+}
+
 .codeSearch__suggestion-text {
   color: $euiColorFullShade;
-  display: flex;
-  flex-direction: column;
-  flex-grow: 0;
-  flex-basis: auto;
   font-family: $euiCodeFontFamily;
   margin-right: $euiSizeXL;
   width: auto;
@@ -228,10 +228,6 @@
 }
 
 .codeSearch-suggestion__description {
-  flex-grow: 1;
-  flex-basis: 0%;
-  display: flex;
-  flex-direction: column;
   color: $euiColorDarkShade;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -242,9 +238,7 @@
 .codeSearch-suggestion__token {
   color: $euiColorFullShade;
   box-sizing: border-box;
-  flex-grow: 0;
-  flex-basis: auto;
-  width: $euiSizeXL;
+  flex: 0 0 $euiSizeXL;
   height: $euiSizeXL;
   text-align: center;
   overflow: hidden;
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestion_component.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestion_component.test.tsx.snap
index 0d76d9c55f556..711476e92b4c6 100644
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestion_component.test.tsx.snap
+++ b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestion_component.test.tsx.snap
@@ -30,7 +30,9 @@ exports[`render file item 1`] = `
     <div
       className="codeSearch-suggestion--inner"
     >
-      <div>
+      <div
+        className="codeSearch__suggestionTextContainer"
+      >
         <div
           className="codeSearch__suggestion-text"
           data-test-subj="codeTypeaheadItem"
@@ -84,7 +86,9 @@ exports[`render repository item 1`] = `
     <div
       className="codeSearch-suggestion--inner"
     >
-      <div>
+      <div
+        className="codeSearch__suggestionTextContainer"
+      >
         <div
           className="codeSearch__suggestion-text"
           data-test-subj="codeTypeaheadItem"
@@ -166,7 +170,9 @@ exports[`render symbol item 1`] = `
           </div>
         </EuiToken>
       </div>
-      <div>
+      <div
+        className="codeSearch__suggestionTextContainer"
+      >
         <div
           className="codeSearch__suggestion-text"
           data-test-subj="codeTypeaheadItem"
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestions_component.test.tsx.snap b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestions_component.test.tsx.snap
index 05d8aa604db4f..323e169c06488 100644
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestions_component.test.tsx.snap
+++ b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/__snapshots__/suggestions_component.test.tsx.snap
@@ -272,7 +272,9 @@ exports[`render full suggestions component 1`] = `
                         </div>
                       </EuiToken>
                     </div>
-                    <div>
+                    <div
+                      className="codeSearch__suggestionTextContainer"
+                    >
                       <div
                         className="codeSearch__suggestion-text"
                         data-test-subj="codeTypeaheadItem"
@@ -404,7 +406,9 @@ exports[`render full suggestions component 1`] = `
                   <div
                     className="codeSearch-suggestion--inner"
                   >
-                    <div>
+                    <div
+                      className="codeSearch__suggestionTextContainer"
+                    >
                       <div
                         className="codeSearch__suggestion-text"
                         data-test-subj="codeTypeaheadItem"
@@ -531,7 +535,9 @@ exports[`render full suggestions component 1`] = `
                   <div
                     className="codeSearch-suggestion--inner"
                   >
-                    <div>
+                    <div
+                      className="codeSearch__suggestionTextContainer"
+                    >
                       <div
                         className="codeSearch__suggestion-text"
                         data-test-subj="codeTypeaheadItem"
@@ -575,7 +581,9 @@ exports[`render full suggestions component 1`] = `
                   <div
                     className="codeSearch-suggestion--inner"
                   >
-                    <div>
+                    <div
+                      className="codeSearch__suggestionTextContainer"
+                    >
                       <div
                         className="codeSearch__suggestion-text"
                         data-test-subj="codeTypeaheadItem"
diff --git a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.tsx b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.tsx
index 3d6f28948d8eb..5a30dda32ff89 100644
--- a/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.tsx
+++ b/x-pack/legacy/plugins/code/public/components/query_bar/components/typeahead/suggestion_component.tsx
@@ -71,7 +71,7 @@ export const SuggestionComponent: SFC<Props> = props => {
     >
       <div className="codeSearch-suggestion--inner">
         {icon}
-        <div>
+        <div className="codeSearch__suggestionTextContainer">
           <div className="codeSearch__suggestion-text" data-test-subj={`codeTypeaheadItem`}>
             {renderMatchingText(props.suggestion.text)}
           </div>
diff --git a/x-pack/legacy/plugins/code/public/style/_layout.scss b/x-pack/legacy/plugins/code/public/style/_layout.scss
index 6b40f0e6106bc..632018cdd03ce 100644
--- a/x-pack/legacy/plugins/code/public/style/_layout.scss
+++ b/x-pack/legacy/plugins/code/public/style/_layout.scss
@@ -7,6 +7,7 @@
 }
 
 .codeContainer__adminMain {
+  overflow: auto;
   padding: $euiSize $euiSizeXL;
 }