diff --git a/src/search/katesearchbar.h b/src/search/katesearchbar.h
--- a/src/search/katesearchbar.h
+++ b/src/search/katesearchbar.h
@@ -109,11 +109,12 @@
     void setSelectionOnly(bool selectionOnly);
     void setMatchCase(bool matchCase);
 
-    // Called for <F3> and <Shift>+<F3>
+    // Called by buttons and typically <F3>/<Shift>+<F3> shortcuts
     void findNext();
     void findPrevious();
-    void findAll();
 
+    // PowerMode stuff
+    void findAll();
     void replaceNext();
     void replaceAll();
 
@@ -140,17 +141,44 @@
     void updateIncInitCursor();
 
     void onPowerPatternChanged(const QString &pattern);
-
     void onPowerModeChanged(int index);
     void onPowerPatternContextMenuRequest();
     void onPowerPatternContextMenuRequest(const QPoint &);
     void onPowerReplacmentContextMenuRequest();
     void onPowerReplacmentContextMenuRequest(const QPoint &);
+    void onPowerCancelFindOrReplace();
+
+    /**
+     * This function do the hard search & replace work in time slice steps.
+     * When all is done @ref m_matchCounter is set and the signal
+     * @ref findOrReplaceAllFinished() is emitted.
+     */
+    void findOrReplaceAll();
+
+
+    /**
+     * Restore needed settings when signal @ref findOrReplaceAllFinished()
+     * was received.
+     */
+    void endFindOrReplaceAll();
+
+Q_SIGNALS:
+    /**
+     * Will emitted by @ref findOrReplaceAll() when all is done.
+     */
+    void findOrReplaceAllFinished();
 
 private:
     // Helpers
-    bool find(SearchDirection searchDirection = SearchForward, const QString *replacement = nullptr);
-    int findAll(KTextEditor::Range inputRange, const QString *replacement);
+    bool find(SearchDirection searchDirection = SearchForward) { return findOrReplace(searchDirection, nullptr); };
+    bool findOrReplace(SearchDirection searchDirection, const QString *replacement);
+
+    /**
+     * The entry point to start a search & replace task.
+     * Set needed member variables and call @ref findOrReplaceAll() to do the work.
+     */
+    void beginFindOrReplaceAll(KTextEditor::Range inputRange, const QString &replacement, bool replaceMode = true);
+    void beginFindAll(KTextEditor::Range inputRange) { beginFindOrReplaceAll(inputRange, QString(), false); };
 
     bool isPatternValid() const;
 
@@ -171,7 +199,7 @@
     void sendConfig();
     void fixForSingleLine(KTextEditor::Range &range, SearchDirection searchDirection);
 
-    void showInfoMessage(const QString &text);
+    void showResultMessage();
 
 private:
     KTextEditor::ViewPrivate *const m_view;
@@ -190,7 +218,14 @@
     KTextEditor::Cursor m_incInitCursor;
 
     // Power search related
-    Ui::PowerSearchBar *m_powerUi;
+    Ui::PowerSearchBar *m_powerUi = nullptr;
+    KTextEditor::MovingRange *m_workingRange = nullptr;
+    KTextEditor::Range m_inputRange;
+    QString m_replacement;
+    uint m_matchCounter = 0;
+    bool m_replaceMode = false;
+    bool m_cancelFindOrReplace = true;
+    std::vector<KTextEditor::Range> m_highlightRanges;
 
     // attribute to highlight matches with
     KTextEditor::Attribute::Ptr highlightMatchAttribute;
diff --git a/src/search/katesearchbar.cpp b/src/search/katesearchbar.cpp
--- a/src/search/katesearchbar.cpp
+++ b/src/search/katesearchbar.cpp
@@ -48,8 +48,8 @@
 #include <QCompleter>
 #include <QShortcut>
 #include <QStringListModel>
+#include <QTime>
 
-#include <memory>
 #include <vector>
 
 // Turn debug messages on/off here
@@ -159,8 +159,9 @@
       m_powerMode(0)
 {
 
-    connect(view, SIGNAL(cursorPositionChanged(KTextEditor::View*,KTextEditor::Cursor)),
-            this, SLOT(updateIncInitCursor()));
+    connect(view, &KTextEditor::View::cursorPositionChanged, this, &KateSearchBar::updateIncInitCursor);
+    connect(view, &KTextEditor::View::selectionChanged, this, &KateSearchBar::updateSelectionOnly);
+    connect(this, &KateSearchBar::findOrReplaceAllFinished, this, &KateSearchBar::endFindOrReplaceAll);
 
     // init match attribute
     Attribute::Ptr mouseInAttribute(new Attribute());
@@ -205,12 +206,15 @@
     }
 
     updateSelectionOnly();
-    connect(view, SIGNAL(selectionChanged(KTextEditor::View*)),
-            this, SLOT(updateSelectionOnly()));
 }
 
 KateSearchBar::~KateSearchBar()
 {
+    if (!m_cancelFindOrReplace) {
+        // Finish/Cancel the still running job to avoid a crash
+        endFindOrReplaceAll();
+    }
+
     clearHighlights();
     delete m_layout;
     delete m_widget;
@@ -279,16 +283,25 @@
     }
 }
 
-void KateSearchBar::showInfoMessage(const QString &text)
+void KateSearchBar::showResultMessage()
 {
-    delete m_infoMessage;
+    QString text;
 
-    m_infoMessage = new KTextEditor::Message(text, KTextEditor::Message::Positive);
-    m_infoMessage->setPosition(KTextEditor::Message::BottomInView);
-    m_infoMessage->setAutoHide(3000); // 3 seconds
-    m_infoMessage->setView(m_view);
+    if (m_replaceMode) {
+        text = i18ncp("short translation", "1 replacement made", "%1 replacements made", m_matchCounter);
+    } else {
+        text = i18ncp("short translation", "1 match found", "%1 matches found", m_matchCounter);
+    }
 
-    m_view->doc()->postMessage(m_infoMessage);
+    if (m_infoMessage) {
+        m_infoMessage->setText(text);
+    } else {
+        m_infoMessage = new KTextEditor::Message(text, KTextEditor::Message::Positive);
+        m_infoMessage->setPosition(KTextEditor::Message::BottomInView);
+        m_infoMessage->setAutoHide(3000); // 3 seconds
+        m_infoMessage->setView(m_view);
+        m_view->doc()->postMessage(m_infoMessage);
+    }
 }
 
 void KateSearchBar::highlightMatch(const Range &range)
@@ -379,9 +392,9 @@
 
 void KateSearchBar::selectRange2(const KTextEditor::Range &range)
 {
-    disconnect(m_view, SIGNAL(selectionChanged(KTextEditor::View*)), this, SLOT(updateSelectionOnly()));
+    disconnect(m_view, &KTextEditor::View::selectionChanged, this, &KateSearchBar::updateSelectionOnly);
     selectRange(m_view, range);
-    connect(m_view, SIGNAL(selectionChanged(KTextEditor::View*)), this, SLOT(updateSelectionOnly()));
+    connect(m_view, &KTextEditor::View::selectionChanged, this, &KateSearchBar::updateSelectionOnly);
 }
 
 void KateSearchBar::onIncPatternChanged(const QString &pattern)
@@ -421,11 +434,9 @@
                                  Range::invalid();
 
     // don't update m_incInitCursor when we move the cursor
-    disconnect(m_view, SIGNAL(cursorPositionChanged(KTextEditor::View*,KTextEditor::Cursor)),
-               this, SLOT(updateIncInitCursor()));
+    disconnect(m_view, &KTextEditor::View::cursorPositionChanged, this, &KateSearchBar::updateIncInitCursor);
     selectRange2(selectionRange);
-    connect(m_view, SIGNAL(cursorPositionChanged(KTextEditor::View*,KTextEditor::Cursor)),
-            this, SLOT(updateIncInitCursor()));
+    connect(m_view, &KTextEditor::View::cursorPositionChanged, this, &KateSearchBar::updateIncInitCursor);
 
     indicateMatch(matchResult);
 }
@@ -517,15 +528,15 @@
     }
 }
 
-bool KateSearchBar::find(SearchDirection searchDirection, const QString *replacement)
+bool KateSearchBar::findOrReplace(SearchDirection searchDirection, const QString *replacement)
 {
     // What to find?
     if (searchPattern().isEmpty()) {
         return false; // == Pattern error
     }
 
     // don't let selectionChanged signal mess around in this routine
-    disconnect(m_view, SIGNAL(selectionChanged(KTextEditor::View*)), this, SLOT(updateSelectionOnly()));
+    disconnect(m_view, &KTextEditor::View::selectionChanged, this, &KateSearchBar::updateSelectionOnly);
 
     // clear previous highlights if there are any
     clearHighlights();
@@ -652,7 +663,7 @@
     }
 
     // restore connection
-    connect(m_view, SIGNAL(selectionChanged(KTextEditor::View*)), this, SLOT(updateSelectionOnly()));
+    connect(m_view, &KTextEditor::View::selectionChanged, this, &KateSearchBar::updateSelectionOnly);
 
     return true; // == No pattern error
 }
@@ -665,12 +676,8 @@
     Range inputRange = (m_view->selection() && selectionOnly())
                        ? m_view->selectionRange()
                        : m_view->document()->documentRange();
-    const int occurrences = findAll(inputRange, nullptr);
 
-    // send passive notification to view
-    showInfoMessage(i18ncp("short translation", "1 match found", "%1 matches found", occurrences));
-
-    indicateMatch(occurrences > 0 ? MatchFound : MatchMismatch);
+    beginFindAll(inputRange);
 }
 
 void KateSearchBar::onPowerPatternChanged(const QString & /*pattern*/)
@@ -782,7 +789,7 @@
 {
     const QString replacement = m_powerUi->replacement->currentText();
 
-    if (find(SearchForward, &replacement)) {
+    if (findOrReplace(SearchForward, &replacement)) {
         // Never merge replace actions with other replace actions/user actions
         m_view->doc()->undoManager()->undoSafePoint();
 
@@ -794,70 +801,100 @@
     }
 }
 
-// replacement == NULL --> Highlight all matches
+// replacement == NULL --> Only highlight all matches
 // replacement != NULL --> Replace and highlight all matches
-int KateSearchBar::findAll(Range inputRange, const QString *replacement)
+void KateSearchBar::beginFindOrReplaceAll(Range inputRange, const QString &replacement, bool replaceMode/* = true*/)
 {
     // don't let selectionChanged signal mess around in this routine
-    disconnect(m_view, SIGNAL(selectionChanged(KTextEditor::View*)), this, SLOT(updateSelectionOnly()));
+    disconnect(m_view, &KTextEditor::View::selectionChanged, this, &KateSearchBar::updateSelectionOnly);
+    // Cancel job when user close the document to avoid crash
+    connect(m_view->doc(), &KTextEditor::Document::aboutToClose, this, &KateSearchBar::endFindOrReplaceAll);
+
+    if (m_powerUi) {
+    // Offer Cancel button and disable not useful buttons
+    m_powerUi->searchCancelStacked->setCurrentIndex(m_powerUi->searchCancelStacked->indexOf(m_powerUi->cancelPage));
+    m_powerUi->findNext->setEnabled(false);
+    m_powerUi->findPrev->setEnabled(false);
+    m_powerUi->replaceNext->setEnabled(false);
+    }
+
+    m_highlightRanges.clear();
+    m_inputRange = inputRange;
+    m_workingRange = m_view->doc()->newMovingRange(m_inputRange);
+    m_replacement = replacement;
+    m_replaceMode = replaceMode;
+    m_matchCounter = 0;
+    m_cancelFindOrReplace = false; // Ensure we have a GO!
+
+    findOrReplaceAll();
+}
 
+void KateSearchBar::findOrReplaceAll()
+{
     const SearchOptions enabledOptions = searchOptions(SearchForward);
 
     const bool regexMode = enabledOptions.testFlag(Regex);
     const bool multiLinePattern = regexMode ? KateRegExp(searchPattern()).isMultiLine() : false;
 
-    std::unique_ptr<KTextEditor::MovingRange> workingRange(m_view->doc()->newMovingRange(inputRange));
-    int matchCounter = 0;
-
     // we highlight all ranges of a replace, up to some hard limit
     // e.g. if you replace 100000 things, rendering will break down otherwise ;=)
     const int maxHighlightings = 65536;
-    std::vector<Range> highlightRanges;
 
     // reuse match object to avoid massive moving range creation
     KateMatch match(m_view->doc(), enabledOptions);
 
     bool block = m_view->selection() && m_view->blockSelection();
-    int line = inputRange.start().line();
+
+    int line = m_inputRange.start().line();
+
+    QTime rolex; // Watchog to suspend the work after some time
+    rolex.start();
+    bool timeOut = false;
+    bool done = false;
     do {
         if (block) {
-            workingRange.reset(m_view->doc()->newMovingRange(m_view->doc()->rangeOnLine(inputRange, line)));
+            delete m_workingRange; // Never forget that!
+            m_workingRange = m_view->doc()->newMovingRange(m_view->doc()->rangeOnLine(m_inputRange, line));
         }
 
-        for (;;) {
-            match.searchText(*workingRange, searchPattern());
+        do {
+            match.searchText(*m_workingRange, searchPattern());
             if (!match.isValid()) {
+                done = true;
                 break;
             }
             bool const originalMatchEmpty = match.isEmpty();
 
             // Work with the match
             Range lastRange;
-            if (replacement != nullptr) {
-                if (matchCounter == 0) {
+            if (m_replaceMode) {
+                if (m_matchCounter == 0) {
                     static_cast<KTextEditor::DocumentPrivate *>(m_view->document())->startEditing();
                 }
 
                 // Replace
-                lastRange = match.replace(*replacement, false, ++matchCounter);
+                lastRange = match.replace(m_replacement, false, ++m_matchCounter);
             } else {
                 lastRange = match.range();
-                ++matchCounter;
+                ++m_matchCounter;
             }
 
             // remember ranges if limit not reached
-            if (matchCounter < maxHighlightings) {
-                highlightRanges.push_back(lastRange);
+            if (m_matchCounter < maxHighlightings) {
+                m_highlightRanges.push_back(lastRange);
             } else {
-                highlightRanges.clear();
+                m_highlightRanges.clear();
+                // TODO Info user that highlighting is disabled
             }
 
             // Continue after match
-            if (lastRange.end() >= workingRange->end()) {
+            if (lastRange.end() >= m_workingRange->end()) {
+                done = true;
                 break;
             }
 
             KTextEditor::DocumentCursor workingStart(m_view->doc(), lastRange.end());
+
             if (originalMatchEmpty) {
                 // Can happen for regex patterns like "^".
                 // If we don't advance here we will loop forever...
@@ -867,50 +904,89 @@
                 // therefore we better advance to the next line
                 workingStart.move(1);
             }
-            workingRange->setRange(workingStart.toCursor(), workingRange->end());
+            m_workingRange->setRange(workingStart.toCursor(), m_workingRange->end());
 
             // Are we done?
-            if (!workingRange->toRange().isValid() || workingStart.atEndOfDocument()) {
+            if (!m_workingRange->toRange().isValid() || workingStart.atEndOfDocument()) {
+                done = true;
                 break;
             }
-        }
 
-    } while (block && ++line <= inputRange.end().line());
+            timeOut = rolex.elapsed() > 150;
+
+        } while (!m_cancelFindOrReplace && !timeOut);
+
+    } while (!m_cancelFindOrReplace && !timeOut && block && ++line <= m_inputRange.end().line());
+
+    if (done || m_cancelFindOrReplace) {
+        emit findOrReplaceAllFinished();
+    } else if (timeOut) {
+        QTimer::singleShot(0, this, &KateSearchBar::findOrReplaceAll);
+    }
+
+    showResultMessage();
+}
+
+void KateSearchBar::endFindOrReplaceAll()
+{
+    // Don't forget to remove our "crash protector"
+    disconnect(m_view->doc(), &KTextEditor::Document::aboutToClose, this, &KateSearchBar::endFindOrReplaceAll);
 
     // After last match
-    if (matchCounter > 0) {
-        if (replacement != nullptr) {
+    if (m_matchCounter > 0) {
+        if (m_replaceMode) {
             static_cast<KTextEditor::DocumentPrivate *>(m_view->document())->finishEditing();
         }
     }
 
     // Add ScrollBarMarks
-    if (!highlightRanges.empty()) {
+    if (!m_highlightRanges.empty()) {
         KTextEditor::MarkInterface* iface = qobject_cast<KTextEditor::MarkInterface*>(m_view->document());
         if (iface) {
             iface->setMarkDescription(KTextEditor::MarkInterface::SearchMatch, i18n("SearchHighLight"));
             iface->setMarkPixmap(KTextEditor::MarkInterface::SearchMatch, QIcon().pixmap(0,0));
-            for (const Range &r : highlightRanges) {
+            for (const Range &r : m_highlightRanges) {
                 iface->addMark(r.start().line(), KTextEditor::MarkInterface::SearchMatch);
             }
         }
     }
 
     // Add highlights
-    if (replacement == nullptr) {
-        for (const Range &r : highlightRanges) {
-            highlightMatch(r);
+    if (m_replaceMode) {
+        for (const Range &r : qAsConst(m_highlightRanges)) {
+            highlightReplacement(r);
         }
+        // Never merge replace actions with other replace actions/user actions
+        m_view->doc()->undoManager()->undoSafePoint();
+
     } else {
-        for (const Range &r : highlightRanges) {
-            highlightReplacement(r);
+        for (const Range &r : qAsConst(m_highlightRanges)) {
+            highlightMatch(r);
         }
+//         indicateMatch(m_matchCounter > 0 ? MatchFound : MatchMismatch); TODO
     }
 
+    // Clean-Up the still hold MovingRange
+    delete m_workingRange;
+
     // restore connection
-    connect(m_view, SIGNAL(selectionChanged(KTextEditor::View*)), this, SLOT(updateSelectionOnly()));
+    connect(m_view, &KTextEditor::View::selectionChanged, this, &KateSearchBar::updateSelectionOnly);
+
+    if (m_powerUi) {
+    // Offer Find and Replace buttons and enable again useful buttons
+    m_powerUi->searchCancelStacked->setCurrentIndex(m_powerUi->searchCancelStacked->indexOf(m_powerUi->searchPage));
+    m_powerUi->findNext->setEnabled(true);
+    m_powerUi->findPrev->setEnabled(true);
+    m_powerUi->replaceNext->setEnabled(true);
 
-    return matchCounter;
+    // Add to search history
+    addCurrentTextToHistory(m_powerUi->pattern);
+
+    // Add to replace history
+    addCurrentTextToHistory(m_powerUi->replacement);
+    }
+
+    m_cancelFindOrReplace = true; // Indicate we are not running
 }
 
 void KateSearchBar::replaceAll()
@@ -927,20 +1003,7 @@
                        ? m_view->selectionRange()
                        : m_view->document()->documentRange();
 
-    // Pass on the hard work
-    int replacementsDone = findAll(inputRange, &replacement);
-
-    // send passive notification to view
-    showInfoMessage(i18ncp("short translation", "1 replacement made", "%1 replacements made", replacementsDone));
-
-    // Never merge replace actions with other replace actions/user actions
-    m_view->doc()->undoManager()->undoSafePoint();
-
-    // Add to search history
-    addCurrentTextToHistory(m_powerUi->pattern);
-
-    // Add to replace history
-    addCurrentTextToHistory(m_powerUi->replacement);
+    beginFindOrReplaceAll(inputRange, replacement);
 }
 
 void KateSearchBar::setSearchPattern(const QString &searchPattern)
@@ -1393,6 +1456,7 @@
         connect(m_powerUi->searchMode, SIGNAL(currentIndexChanged(int)), this, SLOT(onPowerModeChanged(int)));
         connect(m_powerUi->matchCase, SIGNAL(toggled(bool)), this, SLOT(onMatchCaseToggled(bool)));
         connect(m_powerUi->findAll, SIGNAL(clicked()), this, SLOT(findAll()));
+        connect(m_powerUi->cancel, &QPushButton::clicked, this, &KateSearchBar::onPowerCancelFindOrReplace);
 
         // Make [return] in pattern line edit trigger <find next> action
         connect(patternLineEdit, SIGNAL(returnPressed()), this, SLOT(onReturnPressed()));
@@ -1648,6 +1712,11 @@
     onPowerReplacmentContextMenuRequest(m_powerUi->replacement->mapFromGlobal(QCursor::pos()));
 }
 
+void KateSearchBar::onPowerCancelFindOrReplace()
+{
+    m_cancelFindOrReplace = true;
+}
+
 bool KateSearchBar::isPower() const
 {
     return m_powerUi != nullptr;
diff --git a/src/search/searchbarpower.ui b/src/search/searchbarpower.ui
--- a/src/search/searchbarpower.ui
+++ b/src/search/searchbarpower.ui
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>565</width>
-    <height>107</height>
+    <width>1037</width>
+    <height>144</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -44,85 +44,10 @@
      <property name="bottomMargin">
       <number>0</number>
      </property>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="pattern">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-         <horstretch>9</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::StrongFocus</enum>
-       </property>
-       <property name="toolTip">
-        <string>Text to search for</string>
-       </property>
-       <property name="editable">
-        <bool>true</bool>
-       </property>
-       <property name="sizeAdjustPolicy">
-        <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
-       <item>
-        <widget class="QToolButton" name="findNext">
-         <property name="toolTip">
-          <string>Jump to next match</string>
-         </property>
-         <property name="icon">
-          <iconset>
-           <normaloff/>
-          </iconset>
-         </property>
-         <property name="autoRaise">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="findPrev">
-         <property name="toolTip">
-          <string>Jump to previous match</string>
-         </property>
-         <property name="icon">
-          <iconset>
-           <normaloff/>
-          </iconset>
-         </property>
-         <property name="autoRaise">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="1" column="1">
-      <widget class="QComboBox" name="replacement">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-         <horstretch>9</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string>Text to replace with</string>
-       </property>
-       <property name="editable">
-        <bool>true</bool>
-       </property>
-       <property name="sizeAdjustPolicy">
-        <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>F&amp;ind:</string>
+        <string>Fin&amp;d:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -158,53 +83,13 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="2">
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
-       <item>
-        <widget class="QToolButton" name="matchCase">
-         <property name="toolTip">
-          <string>Match case sensitive</string>
-         </property>
-         <property name="icon">
-          <iconset>
-           <normaloff/>
-          </iconset>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="autoRaise">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="selectionOnly">
-         <property name="toolTip">
-          <string>Search in the selection only</string>
-         </property>
-         <property name="icon">
-          <iconset>
-           <normaloff/>
-          </iconset>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="autoRaise">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
      <item row="2" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout">
+      <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,1,0,0,0,0,0">
        <property name="spacing">
         <number>6</number>
        </property>
        <property name="rightMargin">
-        <number>6</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QComboBox" name="searchMode">
@@ -245,6 +130,40 @@
          </item>
         </widget>
        </item>
+       <item>
+        <widget class="QToolButton" name="matchCase">
+         <property name="toolTip">
+          <string>Match case sensitive</string>
+         </property>
+         <property name="icon">
+          <iconset theme="format-text-superscript">
+           <normaloff>.</normaloff>.</iconset>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="selectionOnly">
+         <property name="toolTip">
+          <string>Search in the selection only</string>
+         </property>
+         <property name="icon">
+          <iconset theme="edit-select-all">
+           <normaloff>.</normaloff>.</iconset>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="horizontalSpacer">
          <property name="orientation">
@@ -258,6 +177,34 @@
          </property>
         </spacer>
        </item>
+       <item>
+        <widget class="QToolButton" name="findNext">
+         <property name="toolTip">
+          <string>Jump to next match</string>
+         </property>
+         <property name="icon">
+          <iconset theme="go-down-search">
+           <normaloff>.</normaloff>.</iconset>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="findPrev">
+         <property name="toolTip">
+          <string>Jump to previous match</string>
+         </property>
+         <property name="icon">
+          <iconset theme="go-up-search">
+           <normaloff>.</normaloff>.</iconset>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QPushButton" name="replaceNext">
          <property name="toolTip">
@@ -269,61 +216,129 @@
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="replaceAll">
-         <property name="toolTip">
-          <string>Replace all matches</string>
-         </property>
-         <property name="text">
-          <string>Replace &amp;All</string>
+        <widget class="QStackedWidget" name="searchCancelStacked">
+         <property name="currentIndex">
+          <number>0</number>
          </property>
+         <widget class="QWidget" name="searchPage">
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QPushButton" name="replaceAll">
+             <property name="toolTip">
+              <string>Replace all matches</string>
+             </property>
+             <property name="text">
+              <string>Replace &amp;All</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="findAll">
+             <property name="text">
+              <string>&amp;Find All</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="cancelPage">
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QPushButton" name="cancel">
+             <property name="text">
+              <string>Cancel</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
         </widget>
        </item>
        <item>
-        <widget class="QPushButton" name="findAll">
+        <widget class="QToolButton" name="mutate">
+         <property name="toolTip">
+          <string>Switch to incremental search bar</string>
+         </property>
          <property name="text">
-          <string>&amp;Find All</string>
+          <string/>
+         </property>
+         <property name="icon">
+          <iconset theme="games-config-options"/>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <item>
-      <widget class="QToolButton" name="mutate">
-       <property name="toolTip">
-        <string>Switch to incremental search bar</string>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="pattern">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>9</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="text">
-        <string/>
+       <property name="focusPolicy">
+        <enum>Qt::StrongFocus</enum>
        </property>
-       <property name="icon">
-        <iconset>
-         <normaloff/>
-        </iconset>
+       <property name="toolTip">
+        <string>Text to search for</string>
        </property>
-       <property name="checkable">
+       <property name="editable">
         <bool>true</bool>
        </property>
-       <property name="autoRaise">
-        <bool>true</bool>
+       <property name="sizeAdjustPolicy">
+        <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
        </property>
       </widget>
      </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="replacement">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>9</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Text to replace with</string>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
+       <property name="editable">
+        <bool>true</bool>
+       </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
        </property>
-      </spacer>
+      </widget>
      </item>
     </layout>
    </item>
@@ -333,7 +348,6 @@
   <tabstop>pattern</tabstop>
   <tabstop>replacement</tabstop>
   <tabstop>searchMode</tabstop>
-  <tabstop>mutate</tabstop>
  </tabstops>
  <resources/>
  <connections/>