1 files changed, 15 insertions, 13 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index cc8d820c..74f61995 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -129,6 +129,7 @@ window.initializeModes = ->
     constructor: ->
       super
         name: "normal"
+        indicator: false # There is no mode indicator in normal mode.
         keydown: (event) => onKeydown.call @, event
         keypress: (event) => onKeypress.call @, event
         keyup: (event) => onKeyup.call @, event
@@ -691,7 +692,6 @@ handleKeyCharForFindMode = (keyChar) ->
   updateQueryForFindMode findModeQuery.rawQuery + keyChar
 
 handleEscapeForFindMode = ->
-  exitFindMode()
   document.body.classList.remove("vimiumFindMode")
   # removing the class does not re-color existing selections. we recreate the current selection so it reverts
   # back to the default color.
@@ -705,7 +705,7 @@ handleEscapeForFindMode = ->
 # Return true if character deleted, false otherwise.
 handleDeleteForFindMode = ->
   if findModeQuery.rawQuery.length == 0
-    exitFindMode()
+    HUD.hide()
     performFindInPlace()
     false
   else
@@ -716,7 +716,6 @@ handleDeleteForFindMode = ->
 # <esc> corresponds approximately to 'nevermind, I have found it already' while <cr> means 'I want to save
 # this query and do more searches with it'
 handleEnterForFindMode = ->
-  exitFindMode()
   focusFoundLink()
   document.body.classList.add("vimiumFindMode")
   FindModeHistory.saveQuery findModeQuery.rawQuery
@@ -727,6 +726,7 @@ class FindMode extends Mode
     @partialQuery = ""
     super
       name: "find"
+      indicator: false
       exitOnEscape: true
       exitOnClick: true
 
@@ -991,11 +991,9 @@ window.enterFindMode = ->
   # Save the selection, so performFindInPlace can restore it.
   findModeSaveSelection()
   findModeQuery = { rawQuery: "" }
-  HUD.show("/")
-  new FindMode()
-
-exitFindMode = ->
-  HUD.hide()
+  findMode = new FindMode()
+  HUD.show "/"
+  findMode
 
 window.showHelpDialog = (html, fid) ->
   return if (isShowingHelpDialog || !document.body || fid != frameId)
@@ -1098,13 +1096,17 @@ HUD =
     document.body.appendChild(element)
     element
 
-  hide: (immediate) ->
+  # Hide the HUD.
+  # If :immediate is falsy, then the HUD is faded out smoothly (otherwise it is hidden immediately).
+  # If :updateIndicator is truthy, then we also refresh the mode indicator.  The only time we don't update the
+  # mode indicator, is when hide() is called for the mode indicator itself.
+  hide: (immediate = false, updateIndicator = true) ->
     clearInterval(HUD._tweenId)
-    if (immediate)
-      HUD.displayElement().style.display = "none"
+    if immediate
+      HUD.displayElement().style.display = "none" unless updateIndicator
+      handlerStack.bubbleEvent "indicator" if updateIndicator
     else
-      HUD._tweenId = Tween.fade(HUD.displayElement(), 0, 150,
-        -> HUD.displayElement().style.display = "none")
+      HUD._tweenId = Tween.fade HUD.displayElement(), 0, 150, -> HUD.hide true, updateIndicator
 
   isReady: -> document.body != null