diff --git a/src/components/DataListToolbar/DataListToolbar.jsx b/src/components/DataListToolbar/DataListToolbar.jsx
index 2d62608d4a..e73745ff44 100644
--- a/src/components/DataListToolbar/DataListToolbar.jsx
+++ b/src/components/DataListToolbar/DataListToolbar.jsx
@@ -125,11 +125,9 @@ class DataListToolbar extends React.Component {
                     sortedColumnKey={sortedColumnKey}
                   />
                 </ToolbarItem>
-                { (showExpandCollapse || additionalControls.length) ? (
-                  <VerticalSeparator />
-                ) : null}
                 {showExpandCollapse && (
                   <Fragment>
+                    <VerticalSeparator />
                     <ToolbarGroup>
                       <ExpandCollapse
                         isCompact={isCompact}
diff --git a/src/components/Search/Search.jsx b/src/components/Search/Search.jsx
index 7223a8d9fe..c43c156785 100644
--- a/src/components/Search/Search.jsx
+++ b/src/components/Search/Search.jsx
@@ -10,8 +10,9 @@ import {
   DropdownItem,
   TextInput as PFTextInput
 } from '@patternfly/react-core';
-
-import { SearchIcon } from '@patternfly/react-icons';
+import {
+  SearchIcon
+} from '@patternfly/react-icons';
 
 import styled from 'styled-components';