diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4b28019d9..ce10b89f91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,8 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.md).
 
 - Fixed a layouting issue which occurred on a fresh page load when the layout was scaled to be bigger than the available space. [#3256](https://github.com/scalableminds/webknossos/pull/3256)
 - Fixed overlap in comment tab for long tree names or comments. [#3272](https://github.com/scalableminds/webknossos/pull/3272)
+- Fixed that CTRL + Shift + F opens two search popovers in the tracing view. Instead, the shortcut will only open the tree search now. [#3407](https://github.com/scalableminds/webknossos/pull/3407)
+- Fixed a bug which caused data to not be displayed correctly if adjacent data does not exist.[#3270](https://github.com/scalableminds/webknossos/pull/3270)
 - Fixed a bug which caused data to not be displayed correctly if adjacent data does not exist. [#3270](https://github.com/scalableminds/webknossos/pull/3270)
 - Fixed a bug which caused initial rendering to sometimes miss some buckets. [#3262](https://github.com/scalableminds/webknossos/pull/3262)
 - Fixed a bug which caused the save-button to never show success for volume tracings. [#3267](https://github.com/scalableminds/webknossos/pull/3267)
diff --git a/app/assets/javascripts/oxalis/view/right-menu/search_popover.js b/app/assets/javascripts/oxalis/view/right-menu/search_popover.js
index ff713380ff..d8e43f811f 100644
--- a/app/assets/javascripts/oxalis/view/right-menu/search_popover.js
+++ b/app/assets/javascripts/oxalis/view/right-menu/search_popover.js
@@ -13,6 +13,7 @@ type Props<S> = {
   idKey: $Keys<S>,
   onSelect: number => void,
   children: *,
+  provideShortcut?: boolean,
 };
 
 type State = {
@@ -35,13 +36,15 @@ export default class SearchPopover<S: Object> extends React.PureComponent<Props<
 
     return (
       <React.Fragment>
-        <Shortcut
-          supportInputElements
-          keys="ctrl + shift + f"
-          onTrigger={() => {
-            this.setState({ isVisible: true });
-          }}
-        />
+        {this.props.provideShortcut ? (
+          <Shortcut
+            supportInputElements
+            keys="ctrl + shift + f"
+            onTrigger={() => {
+              this.setState({ isVisible: true });
+            }}
+          />
+        ) : null}
         <Popover
           title="Search"
           trigger="click"
diff --git a/app/assets/javascripts/oxalis/view/right-menu/trees_tab_view.js b/app/assets/javascripts/oxalis/view/right-menu/trees_tab_view.js
index f143835fae..7fa5ea545d 100644
--- a/app/assets/javascripts/oxalis/view/right-menu/trees_tab_view.js
+++ b/app/assets/javascripts/oxalis/view/right-menu/trees_tab_view.js
@@ -250,6 +250,7 @@ class TreesTabView extends React.PureComponent<Props, State> {
             idKey="treeId"
             searchKey="name"
             maxSearchResults={10}
+            provideShortcut
           >
             <Tooltip title="Open the search via CTRL + Shift + F">
               <ButtonComponent>