Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 ktexteditor (5.26.0-0ubuntu1) yakkety; urgency=low
 .
   * New upstream release (5.26.0)
Author: Rik Mills <rik.mills88@gmail.com>
 
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
 
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2016-10-12
 
--- ktexteditor-5.26.0.orig/src/inputmode/katenormalinputmode.cpp
+++ ktexteditor-5.26.0/src/inputmode/katenormalinputmode.cpp
@@ -184,7 +184,7 @@ KateSearchBar *KateNormalInputMode::sear
     const bool wantPowerMode = (mode == PowerSearchBar);
 
     /**
-     * create search bar as not there? use right mode
+     * create search bar is not there? use right mode
      */
     if (!m_searchBar) {
         m_searchBar = new KateSearchBar(wantPowerMode, view(), KateViewConfig::global());
@@ -193,11 +193,12 @@ KateSearchBar *KateNormalInputMode::sear
     /**
      * else: switch mode if needed!
      */
-    else if ((mode != IncrementalSearchBarOrKeepMode) && (wantPowerMode != m_searchBar->isPower())) {
-        if (wantPowerMode)
+    else if (mode != IncrementalSearchBarOrKeepMode) {
+        if (wantPowerMode) {
            m_searchBar->enterPowerMode();
-        else
+        } else {
             m_searchBar->enterIncrementalMode();
+        }
     }
 
     return m_searchBar;
--- ktexteditor-5.26.0.orig/src/inputmode/katenormalinputmode.h
+++ ktexteditor-5.26.0/src/inputmode/katenormalinputmode.h
@@ -78,9 +78,9 @@ public:
 private:
     /**
      * Search bar mode:
-     *   - Incremental mode
-     *   - Power mode, aka find & replace
-     *   - Incremental mode, but don't change mode if already there
+     *   - Setup Incremental mode, among other things: potential new search pattern
+     *   - Setup Power mode, aka find & replace: Also potential new search pattern
+     *   - Use current mode and current search pattern or if no Search bar exists, launch Incremental mode
     */
    enum SearchBarMode {
        IncrementalSearchBar,