diff --git a/addons/replicode/replicodeview.cpp b/addons/replicode/replicodeview.cpp
--- a/addons/replicode/replicodeview.cpp
+++ b/addons/replicode/replicodeview.cpp
@@ -5,12 +5,12 @@
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
- 
+
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
- 
+
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -54,12 +54,10 @@
     m_executor(nullptr)
 {
     m_runAction = new QAction(QIcon(QStringLiteral("code-block")), i18n("Run replicode"), this);
-    actionCollection()->setDefaultShortcut(m_runAction, Qt::Key_F8);
     connect(m_runAction, &QAction::triggered, this, &ReplicodeView::runReplicode);
     actionCollection()->addAction(QStringLiteral("katereplicode_run"), m_runAction);
 
     m_stopAction = new QAction(QIcon(QStringLiteral("process-stop")), i18n("Stop replicode"), this);
-    actionCollection()->setDefaultShortcut(m_stopAction, Qt::Key_F9);
     connect(m_stopAction, &QAction::triggered, this, &ReplicodeView::stopReplicode);
     actionCollection()->addAction(QStringLiteral("katereplicode_stop"), m_stopAction);
     m_stopAction->setEnabled(false);
diff --git a/addons/search/plugin_search.cpp b/addons/search/plugin_search.cpp
--- a/addons/search/plugin_search.cpp
+++ b/addons/search/plugin_search.cpp
@@ -251,10 +251,12 @@
 
     a = actionCollection()->addAction(QStringLiteral("go_to_next_match"));
     a->setText(i18n("Go to Next Match"));
+    actionCollection()->setDefaultShortcut(a, QKeySequence(Qt::Key_F6));
     connect(a, &QAction::triggered, this, &KatePluginSearchView::goToNextMatch);
 
     a = actionCollection()->addAction(QStringLiteral("go_to_prev_match"));
     a->setText(i18n("Go to Previous Match"));
+    actionCollection()->setDefaultShortcut(a, QKeySequence(Qt::SHIFT + Qt::Key_F6));
     connect(a, &QAction::triggered, this, &KatePluginSearchView::goToPreviousMatch);
 
     m_ui.resultTabWidget->tabBar()->setSelectionBehaviorOnRemove(QTabBar::SelectLeftTab);
diff --git a/kate/kateviewmanager.cpp b/kate/kateviewmanager.cpp
--- a/kate/kateviewmanager.cpp
+++ b/kate/kateviewmanager.cpp
@@ -1021,7 +1021,7 @@
      * delete mapping of now deleted views
      */
     m_views.clear();
-    
+
     /**
      * kill all previous existing sub-splitters, just to be sure
      * e.g. important if one restores a config in an existing window with some splitters