diff --git a/src/public/app/widgets/find_in_code.js b/src/public/app/widgets/find_in_code.js
index 0d4d4ec64..40308bae6 100644
--- a/src/public/app/widgets/find_in_code.js
+++ b/src/public/app/widgets/find_in_code.js
@@ -115,7 +115,7 @@ export default class FindInCode {
 
         return {
             totalFound,
-            currentFound: currentFound + 1
+            currentFound: Math.min(currentFound + 1, totalFound)
         };
     }
 
diff --git a/src/public/app/widgets/find_in_html.js b/src/public/app/widgets/find_in_html.js
index 349c70d51..7bdecb529 100644
--- a/src/public/app/widgets/find_in_html.js
+++ b/src/public/app/widgets/find_in_html.js
@@ -39,7 +39,7 @@ export default class FindInHtml {
 
                             res({
                                 totalFound: this.$results.length,
-                                currentFound: 1
+                                currentFound: Math.min(1, this.$results.length)
                             });
                         }
                     });
diff --git a/src/public/app/widgets/find_in_text.js b/src/public/app/widgets/find_in_text.js
index e7044eb18..87a507c75 100644
--- a/src/public/app/widgets/find_in_text.js
+++ b/src/public/app/widgets/find_in_text.js
@@ -59,7 +59,7 @@ export default class FindInText {
 
         return {
             totalFound,
-            currentFound: currentFound + 1
+            currentFound: Math.min(currentFound + 1, totalFound)
         };
     }