 
     # Show notification count.
     notificationCount = battle.get('notifications')
-    $notifications.text(notificationCount)
-    $notifications.removeClass('hidden')
+    if notificationCount > 0
+      $notifications.text(notificationCount)
+      $notifications.removeClass('hidden')
+    else
+      $notifications.addClass('hidden')
 
   addBattle: (battle) =>
     @$(".header_battles, .nav_battles").removeClass("hidden")

    $navItem = @$("[data-battle-id='#{battleId}']")
    @changeWindowTo($battle, $navItem)
    PokeBattle.router.navigate("battles/#{battleId}")


  focusBattle: (e) =>
    $this = $(e.currentTarget)
    @resetNotifications($this)
    battleId = $this.data('battle-id')
    @changeWindowToBattle(battleId)

  focusLobby: (e) =>
    # TODO: Clean this up once rooms are implemented
    # right now it duplicates part of focusRoom()
    $lobbyLink = @$(".nav_rooms li").first()
    @resetNotifications($lobbyLink)
    $room = $('.chat_window')
    @changeWindowTo($room, $lobbyLink)
    PokeBattle.router.navigate("")

  focusRoom: (e) =>
    $this = $(e.currentTarget)
    @resetNotifications($this)
    # TODO: Remove hardcoding once rooms are implemented
    $room = $('.chat_window')
    @changeWindowTo($room, $this)
