diff --git a/src/Common.js b/src/Common.js
index 7075e9e..672cc51 100644
--- a/src/Common.js
+++ b/src/Common.js
@@ -309,7 +309,14 @@ export class HighlightedMarkdown extends Component {
                     ) : rule === 'search' ? (
                       <span className="search-query-highlight">{p}</span>
                     ) : rule === 'tag' ? (
-                      <a href={p}>{p}</a>
+                      <a
+                        href={p}
+                        onClick={() => {
+                          window.SEARCH_SUBMODE_BACKUP = 0;
+                        }}
+                      >
+                        {p}
+                      </a>
                     ) : (
                       p
                     )}
diff --git a/src/Flows.js b/src/Flows.js
index a68a86b..9ece458 100644
--- a/src/Flows.js
+++ b/src/Flows.js
@@ -1430,7 +1430,10 @@ export class Flow extends PureComponent {
     super(props);
     let submode = window[props.mode.toUpperCase() + '_SUBMODE_BACKUP'];
     if (submode === undefined) {
-      submode = props.mode === 'list' ? (window.config.by_c ? 1 : 0) : 0;
+      submode =
+        (props.mode === 'list' && window.config.by_c) || props.mode === 'search'
+          ? 1
+          : 0;
     }
     this.state = {
       submode: submode,