diff --git a/packages/components/src/SearchInput.scss b/packages/components/src/SearchInput.scss
index 950818223..ff93f1ca7 100644
--- a/packages/components/src/SearchInput.scss
+++ b/packages/components/src/SearchInput.scss
@@ -55,31 +55,4 @@
     border-radius: 1rem;
     background-color: rgba($white, 0.25);
   }
-
-  .search-change-selection {
-    position: absolute;
-    right: $spacer-1;
-    top: 15%;
-    bottom: 15%;
-    height: 70%;
-  }
-
-  .search-change-button {
-    background: none;
-    border: none;
-    padding: 1px 2px; 
-  }
-
-  .search-change-text {
-    background-color: rgba($white, 0.2);
-    border-radius: 10px;
-    padding: 1px 5px;
-  }
-
-  .match_count {
-    background-color: rgba($white, 0.2);
-    border-radius: 10px;
-    padding: 1px 5px;
-    margin: 0 5px;
-  }
 }
diff --git a/packages/components/src/SearchInput.tsx b/packages/components/src/SearchInput.tsx
index 4e1c66e97..165292d73 100644
--- a/packages/components/src/SearchInput.tsx
+++ b/packages/components/src/SearchInput.tsx
@@ -1,14 +1,9 @@
 import React, { PureComponent } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { vsArrowLeft, vsArrowRight, vsSearch } from '@deephaven/icons';
+import { vsSearch } from '@deephaven/icons';
 import classNames from 'classnames';
-import Button from './Button';
 import './SearchInput.scss';
 
-interface QueryParams {
-  queriedColumnIndex: number | undefined;
-  changeQueriedColumnIndex: (direction: 'forward' | 'back') => void;
-}
 interface SearchInputProps {
   value: string;
   placeholder: string;
@@ -20,7 +15,6 @@ interface SearchInputProps {
   matchCount: number;
   id: string;
   'data-testid'?: string;
-  queryParams?: QueryParams;
 }
 
 class SearchInput extends PureComponent<SearchInputProps> {
@@ -33,40 +27,19 @@ class SearchInput extends PureComponent<SearchInputProps> {
     },
     id: '',
     'data-testid': undefined,
-    queryParams: undefined,
   };
 
   constructor(props: SearchInputProps) {
     super(props);
     this.inputField = React.createRef();
-    this.searchChangeSelection = React.createRef();
-  }
-
-  componentDidMount(): void {
-    this.setInputPaddingRight();
   }
 
-  componentDidUpdate(): void {
-    this.setInputPaddingRight();
-  }
+  inputField: React.RefObject<HTMLInputElement>;
 
   focus(): void {
     this.inputField.current?.focus();
   }
 
-  inputField: React.RefObject<HTMLInputElement>;
-
-  searchChangeSelection: React.RefObject<HTMLDivElement>;
-
-  setInputPaddingRight(): void {
-    const inputField = this.inputField.current;
-    const searchChangeSelection = this.searchChangeSelection.current;
-    if (inputField && searchChangeSelection) {
-      const paddingRight = searchChangeSelection.getBoundingClientRect().width;
-      inputField.style.paddingRight = `${paddingRight}px`;
-    }
-  }
-
   render(): JSX.Element {
     const {
       value,
@@ -79,47 +52,7 @@ class SearchInput extends PureComponent<SearchInputProps> {
       id,
       onKeyDown,
       'data-testid': dataTestId,
-      queryParams,
     } = this.props;
-
-    let matchCountSection;
-
-    if (queryParams && matchCount > 1) {
-      matchCountSection = (
-        <>
-          <Button
-            kind="ghost"
-            className="search-change-button"
-            type="button"
-            onClick={() => {
-              queryParams.changeQueriedColumnIndex('back');
-            }}
-            icon={vsArrowLeft}
-            tooltip="Next match"
-          />
-          <span className="search-change-text">
-            {queryParams.queriedColumnIndex !== undefined &&
-              `${queryParams.queriedColumnIndex + 1} of `}
-            {matchCount}
-          </span>
-          <Button
-            kind="ghost"
-            className="search-change-button"
-            type="button"
-            onClick={() => {
-              queryParams.changeQueriedColumnIndex('forward');
-            }}
-            icon={vsArrowRight}
-            tooltip="Next match"
-          />
-        </>
-      );
-    } else {
-      matchCountSection = matchCount > 0 && (
-        <span className="match_count">{matchCount}</span>
-      );
-    }
-
     return (
       <div className={classNames('search-group', className)}>
         <input
@@ -135,19 +68,12 @@ class SearchInput extends PureComponent<SearchInputProps> {
           id={id}
           data-testid={dataTestId}
         />
-
-        {matchCount != null ? (
-          <div
-            className="search-change-selection"
-            ref={this.searchChangeSelection}
-          >
-            {matchCountSection}
-          </div>
-        ) : (
-          <span className="search-icon">
-            <FontAwesomeIcon icon={vsSearch} />
-          </span>
+        {matchCount != null && (
+          <span className="search-match">{matchCount}</span>
         )}
+        <span className="search-icon">
+          <FontAwesomeIcon icon={vsSearch} />
+        </span>
       </div>
     );
   }
diff --git a/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.test.tsx b/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.test.tsx
index 1608b8875..c08ba232a 100644
--- a/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.test.tsx
+++ b/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.test.tsx
@@ -1184,31 +1184,3 @@ test('On drag start/end', () => {
   expect(mockGroupHandler).toBeCalledWith([]);
   expect(mockMoveHandler).toBeCalledWith([{ from: 0, to: 1 }]);
 });
-
-test('changeSelectedColumn moves queried column index and loops', () => {
-  const builder = React.createRef<VisibilityOrderingBuilder>();
-  render(<Builder builderRef={builder} />);
-
-  builder.current?.searchColumns('TestColumn');
-  expect(builder.current?.state.selectedColumns.size).toEqual(10);
-
-  builder.current?.changeSelectedColumn('forward');
-  expect(builder.current?.state.queriedColumnIndex).toEqual(9);
-
-  builder.current?.changeSelectedColumn('forward');
-  expect(builder.current?.state.queriedColumnIndex).toEqual(0);
-});
-
-test('adjustQueriedIndex sets queriedColumnRange to prevIndex = 9 and nextIndex = 0', () => {
-  const builder = React.createRef<VisibilityOrderingBuilder>();
-  render(<Builder builderRef={builder} />);
-
-  builder.current?.searchColumns('TestColumn');
-
-  builder.current?.adjustQueriedIndex('Test');
-
-  expect(builder.current?.state.queriedColumnRange).toEqual({
-    prevIndex: 9,
-    nextIndex: 0,
-  });
-});
diff --git a/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.tsx b/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.tsx
index c4a3aa08f..6940aca12 100644
--- a/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.tsx
+++ b/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.tsx
@@ -48,11 +48,6 @@ import {
 
 const DEBOUNCE_SEARCH_COLUMN = 150;
 
-interface IndexRange {
-  prevIndex: number;
-  nextIndex: number;
-}
-
 interface VisibilityOrderingBuilderProps {
   model: IrisGridModel;
   movedColumns: readonly MoveOperation[];
@@ -72,9 +67,6 @@ interface VisibilityOrderingBuilderProps {
 
 interface VisibilityOrderingBuilderState {
   selectedColumns: Set<string>;
-  queriedColumnIndex: number | undefined;
-  queriedColumnRange: IndexRange | undefined;
-  prevQueriedColumns: Record<number, string> | undefined;
   lastSelectedColumn: string;
   searchFilter: string;
 }
@@ -108,9 +100,6 @@ class VisibilityOrderingBuilder extends Component<
 
     this.state = {
       selectedColumns: new Set(),
-      queriedColumnIndex: undefined,
-      queriedColumnRange: undefined,
-      prevQueriedColumns: undefined,
       lastSelectedColumn: '',
       searchFilter: '',
     };
@@ -136,9 +125,6 @@ class VisibilityOrderingBuilder extends Component<
 
     this.setState({
       selectedColumns: new Set(),
-      queriedColumnIndex: undefined,
-      queriedColumnRange: undefined,
-      prevQueriedColumns: undefined,
       lastSelectedColumn: '',
       searchFilter: '',
     });
@@ -149,12 +135,7 @@ class VisibilityOrderingBuilder extends Component<
   }
 
   resetSelection(): void {
-    this.setState({
-      selectedColumns: new Set(),
-      queriedColumnIndex: undefined,
-      prevQueriedColumns: undefined,
-      lastSelectedColumn: '',
-    });
+    this.setState({ selectedColumns: new Set(), lastSelectedColumn: '' });
   }
 
   handleSearchInputChange(event: ChangeEvent<HTMLInputElement>): void {
@@ -176,143 +157,17 @@ class VisibilityOrderingBuilder extends Component<
         id.toLowerCase().includes(searchFilter.toLowerCase())
     );
 
-    const columnsMatchMap: Record<number, string> = itemsMatch.reduce(
-      (acc, { id, index }) => ({ ...acc, [index]: id }),
-      {}
-    );
-
-    const columnIds: string[] = itemsMatch.map(({ id }) => id);
-
-    this.addColumnToSelected(columnIds, false);
-
+    const columnsMatch = itemsMatch.map(({ id }) => id);
     const visibleIndexToFocus = flattenedItems.findIndex(({ id }) =>
       id.toLowerCase().includes(searchFilter.toLowerCase())
     );
 
-    if (columnIds.length > 0) {
+    this.addColumnToSelected(columnsMatch, false);
+    if (columnsMatch.length > 0) {
       const columnItemToFocus =
         this.list?.querySelectorAll('.item-wrapper')[visibleIndexToFocus];
       columnItemToFocus?.scrollIntoView({ block: 'center' });
     }
-
-    this.setState({
-      prevQueriedColumns: columnsMatchMap,
-      queriedColumnIndex: undefined,
-    });
-  }
-
-  /**
-   * Change the selected column to the next or previous column that matches the search criteria.
-   *
-   * queriedColumnRange stores the closes options in the case that the user clicks on an option that didn't fulfill the search criteria.
-   * On click of the forward/back button, queriedColumnIndex is updated to either the upper or lower index in queriedColumnRange
-   *
-   * queriedColumnIndex is the current index within prevQueriedColumns. Not their actual index in the tree.
-   *
-   * @param direction The direction to move the selection
-   */
-
-  changeSelectedColumn(direction: 'forward' | 'back'): void {
-    const { queriedColumnIndex, queriedColumnRange, prevQueriedColumns } =
-      this.state;
-    let newQueriedColumnIndex = queriedColumnIndex;
-
-    if (prevQueriedColumns === undefined) return;
-
-    const queriedColumnsLength = Object.keys(prevQueriedColumns).length;
-
-    if (direction === 'forward') {
-      if (queriedColumnRange !== undefined) {
-        newQueriedColumnIndex = queriedColumnRange.nextIndex;
-      } else if (newQueriedColumnIndex === undefined) {
-        newQueriedColumnIndex = queriedColumnsLength - 1;
-      } else if (newQueriedColumnIndex >= queriedColumnsLength - 1) {
-        newQueriedColumnIndex = 0;
-      } else {
-        newQueriedColumnIndex += 1;
-      }
-    } else if (direction === 'back') {
-      if (queriedColumnRange !== undefined) {
-        newQueriedColumnIndex = queriedColumnRange.prevIndex;
-      } else if (newQueriedColumnIndex === undefined) {
-        newQueriedColumnIndex = 0;
-      } else if (newQueriedColumnIndex <= 0) {
-        newQueriedColumnIndex = queriedColumnsLength - 1;
-      } else {
-        newQueriedColumnIndex -= 1;
-      }
-    }
-
-    this.addColumnToSelected(
-      [Object.values(prevQueriedColumns)[newQueriedColumnIndex as number]],
-      false
-    );
-
-    const actualColumnIndex: number = parseInt(
-      Object.keys(prevQueriedColumns)[newQueriedColumnIndex as number],
-      10
-    );
-
-    const columnItemToFocus =
-      this.list?.querySelectorAll('.item-wrapper')[actualColumnIndex];
-    columnItemToFocus?.scrollIntoView({ block: 'center' });
-
-    this.setState({
-      queriedColumnIndex: newQueriedColumnIndex,
-      queriedColumnRange: undefined,
-    });
-  }
-
-  /**
-   * Handles changing the queriedColumnIndex on user click.
-   *
-   * If the option clicked matches the search criteria the index is updated immediately.
-   *
-   * If the option clicked doesn't meet the search criteria, the two closest options that fulfill the criteria are stored.
-   * On click of the forward/back button the selection will change to one of those options. (Think of VS Code search functionality)
-   *
-   * @param name the name of the clicked column
-   */
-  adjustQueriedIndex(name: string): void {
-    const { prevQueriedColumns } = this.state;
-
-    if (prevQueriedColumns === undefined) return;
-
-    if (name in Object.values(prevQueriedColumns)) {
-      const newQueriedColumnIndex =
-        Object.values(prevQueriedColumns).indexOf(name);
-
-      this.setState({
-        queriedColumnIndex: newQueriedColumnIndex,
-        queriedColumnRange: undefined,
-      });
-      return;
-    }
-
-    const flattenedItems = flattenTree(this.getTreeItems());
-    const clickedIndex = flattenedItems.findIndex(item => item.id === name);
-
-    const queriedColumnsIndexes = Object.keys(prevQueriedColumns).map(idx =>
-      parseInt(idx, 10)
-    );
-
-    let prevIndex = queriedColumnsIndexes.length - 1;
-    let nextIndex = 0;
-
-    for (let i = 0; i < queriedColumnsIndexes.length; i += 1) {
-      const index = queriedColumnsIndexes[i];
-
-      if (index < clickedIndex) {
-        prevIndex = i;
-      } else if (index > clickedIndex) {
-        nextIndex = i;
-        break;
-      }
-    }
-
-    this.setState({
-      queriedColumnRange: { prevIndex, nextIndex },
-    });
   }
 
   /**
@@ -685,8 +540,6 @@ class VisibilityOrderingBuilder extends Component<
       isModifierKeyDown || isShiftKeyDown
     );
 
-    this.adjustQueriedIndex(name);
-
     this.setState({
       lastSelectedColumn: name,
     });
@@ -1162,12 +1015,7 @@ class VisibilityOrderingBuilder extends Component<
 
   render(): ReactElement {
     const { model, hiddenColumns, onColumnVisibilityChanged } = this.props;
-    const {
-      selectedColumns,
-      searchFilter,
-      prevQueriedColumns,
-      queriedColumnIndex,
-    } = this.state;
+    const { selectedColumns, searchFilter } = this.state;
     const hasSelection = selectedColumns.size > 0;
     const treeItems = this.getTreeItems();
     const nameToIndexes = new Map(
@@ -1201,14 +1049,6 @@ class VisibilityOrderingBuilder extends Component<
       treeItems
     );
 
-    const queryParams = {
-      queriedColumnIndex,
-      changeQueriedColumnIndex: (direction: 'forward' | 'back') =>
-        this.changeSelectedColumn(direction),
-    };
-
-    const matchCount = Object.keys(prevQueriedColumns ?? {}).length;
-
     return (
       <div role="menu" className="visibility-ordering-builder" tabIndex={0}>
         <div className="top-menu">
@@ -1227,9 +1067,8 @@ class VisibilityOrderingBuilder extends Component<
           <SearchInput
             className="visibility-search"
             value={searchFilter}
-            matchCount={searchFilter ? matchCount : undefined}
+            matchCount={searchFilter ? selectedColumns.size : undefined}
             onChange={this.handleSearchInputChange}
-            queryParams={queryParams}
           />
         </div>
         <div className="top-menu">
diff --git a/tests/table-operations.spec.ts-snapshots/organize-columns-1-chromium-linux.png b/tests/table-operations.spec.ts-snapshots/organize-columns-1-chromium-linux.png
index 16d303715..fe86b9eaa 100644
Binary files a/tests/table-operations.spec.ts-snapshots/organize-columns-1-chromium-linux.png and b/tests/table-operations.spec.ts-snapshots/organize-columns-1-chromium-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/organize-columns-1-firefox-linux.png b/tests/table-operations.spec.ts-snapshots/organize-columns-1-firefox-linux.png
index f8a3c50f1..61a8a0cb0 100644
Binary files a/tests/table-operations.spec.ts-snapshots/organize-columns-1-firefox-linux.png and b/tests/table-operations.spec.ts-snapshots/organize-columns-1-firefox-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/organize-columns-1-webkit-linux.png b/tests/table-operations.spec.ts-snapshots/organize-columns-1-webkit-linux.png
index 23389bea2..627b42183 100644
Binary files a/tests/table-operations.spec.ts-snapshots/organize-columns-1-webkit-linux.png and b/tests/table-operations.spec.ts-snapshots/organize-columns-1-webkit-linux.png differ