diff --git a/src/components/search-panel/SearchPanel.tsx b/src/components/search-panel/SearchPanel.tsx
index 4d0c54251..8961336ef 100644
--- a/src/components/search-panel/SearchPanel.tsx
+++ b/src/components/search-panel/SearchPanel.tsx
@@ -50,7 +50,7 @@ const SearchPanel = () => {
 			</div>
 			{searchStore.currentSearch && (
 				<SearchPanelResults
-					resultGroups={searchStore.sortedResultGroups}
+					flattenedResult={searchStore.flattenedResult}
 					timestamp={searchStore.currentSearch.timestamp}
 					onResultItemClick={onResultItemClick}
 					onResultGroupClick={searchWorkspace.followByTimestamp}
diff --git a/src/components/search-panel/SearchPanelResults.tsx b/src/components/search-panel/SearchPanelResults.tsx
index f3dfec4c1..49b2c516b 100644
--- a/src/components/search-panel/SearchPanelResults.tsx
+++ b/src/components/search-panel/SearchPanelResults.tsx
@@ -23,9 +23,11 @@ import { SearchResult } from '../../stores/SearchStore';
 import SearchResultGroup from './SearchResultGroup';
 import { ActionType } from '../../models/EventAction';
 import SearchPanelSeparator from './SearchPanelSeparator';
-import { getTimestampAsNumber } from '../../helpers/date';
 import StateSaverProvider from '../util/StateSaverProvider';
 
+type Separator = [number, number];
+type FlattenedResult = SearchResult[] | Separator;
+
 interface SearchPanelResultsProps {
 	onResultItemClick: (searchResult: BookmarkedItem) => void;
 	onResultGroupClick: (timestamp: number, resultType: ActionType) => void;
@@ -35,7 +37,7 @@ interface SearchPanelResultsProps {
 	showToggler: boolean;
 	next: () => void;
 	prev: () => void;
-	resultGroups: [string, SearchResult[]][];
+	flattenedResult: FlattenedResult[];
 	timestamp: number;
 	disabledRemove: boolean;
 	showLoadMoreButton: boolean;
@@ -44,7 +46,7 @@ interface SearchPanelResultsProps {
 
 const SearchPanelResults = (props: SearchPanelResultsProps) => {
 	const {
-		resultGroups,
+		flattenedResult,
 		timestamp,
 		onResultItemClick,
 		onResultGroupClick,
@@ -59,20 +61,26 @@ const SearchPanelResults = (props: SearchPanelResultsProps) => {
 	} = props;
 
 	function computeKey(index: number) {
-		const [, results] = resultGroups[index];
+		const results = flattenedResult[index];
+		if (isSeparator(results)) return results[0];
 		const item = results[0];
 		return isEventNode(item) ? item.eventId : item.messageId;
 	}
 
-	const renderResult = (index: number, [_, results]: [string, SearchResult[]]) => {
+	const isSeparator = (object: any): object is Separator => {
+		return !Number.isNaN(+object[0]);
+	};
+
+	const renderResult = (index: number, results: FlattenedResult) => {
+		if (isSeparator(results)) {
+			return (
+				<React.Fragment>
+					<SearchPanelSeparator prevElement={results[0]} nextElement={results[1]} />
+				</React.Fragment>
+			);
+		}
 		return (
-			<React.Fragment key={computeKey(index)}>
-				{index > 0 && (
-					<SearchPanelSeparator
-						prevElement={getTimestampAsNumber(resultGroups[index - 1][1].slice(-1)[0])}
-						nextElement={getTimestampAsNumber(results[0])}
-					/>
-				)}
+			<React.Fragment>
 				<SearchResultGroup
 					results={results}
 					onResultClick={onResultItemClick}
@@ -114,9 +122,10 @@ const SearchPanelResults = (props: SearchPanelResultsProps) => {
 			<div className='search-results__list'>
 				<StateSaverProvider>
 					<Virtuoso
-						data={resultGroups}
+						data={flattenedResult}
 						className={'search-results__list-virtual'}
 						style={{ height: '100%' }}
+						computeItemKey={computeKey}
 						components={{
 							Footer: loadMoreButton,
 						}}
diff --git a/src/stores/SearchStore.ts b/src/stores/SearchStore.ts
index 33ec17627..643039984 100644
--- a/src/stores/SearchStore.ts
+++ b/src/stores/SearchStore.ts
@@ -324,6 +324,20 @@ export class SearchStore {
 		});
 	}
 
+	@computed get flattenedResult() {
+		if (!this.currentSearch) return [];
+		const result: (SearchResult[] | [number, number])[] = [];
+		this.sortedResultGroups.forEach(([, value], index) => {
+			if (index > 0)
+				result.push([
+					getTimestampAsNumber(this.sortedResultGroups[index - 1][1].slice(-1)[0]),
+					getTimestampAsNumber(value[0]),
+				]);
+			result.push(value);
+		});
+		return result;
+	}
+
 	@action
 	getEventFilters = async () => {
 		this.isEventsFilterLoading = true;
diff --git a/src/styles/action.scss b/src/styles/action.scss
index 02ea839a4..ca62bea15 100644
--- a/src/styles/action.scss
+++ b/src/styles/action.scss
@@ -431,6 +431,7 @@
 
 	&__load-button {
 		@include clickable;
+		height: 40px;
 
 		display: block;
 		border-radius: 4px;