             @history_view.clear_history event
             @clear_history()
 
-        open_close_history: (event) =>
-            @history_view.open_close_history event, @$('.close_queries_link')
+        open_close_history: (event, args) =>
+            @history_view.open_close_history(args)
             if @history_view.state is 'visible'
-                @$('.clear_queries_link').fadeIn 'fast'
+                @saved_data.history_state = 'visible'
+                if args?.no_animation is true
+                    @$('.clear_queries_link').show()
+                else
+                    @$('.clear_queries_link').fadeIn 'fast'
                 @$('.close_queries_link').addClass 'active'
             else
+                @saved_data.history_state = 'hidden'
                 @$('.clear_queries_link').fadeOut 'fast'
                 @$('.close_queries_link').removeClass 'active'
 

                    metadata: null
                    cursor_timed_out: true
                    view: 'tree'

            # Load history, keep it in memory for the session
            if not DataExplorerView.Container.prototype.history?

                else
                    size = Math.min @$('.history_list').height(), @height_history
            @$('.nano').css 'visibility', 'visible'
            if args?.no_animation is true
                @$('.nano').height size
                @$('.nano').css 'visibility', 'visible' # In case the user trigger hide/show really fast
                @$('.arrow_history').show() # In case the user trigger hide/show really fast
                @$('.nano_border').show() # In case the user trigger hide/show really fast
                @$('.nano').nanoScroller({preventPageScrolling: true})
            else
                @desactivate_overflow()
                @$('.nano').animate
                    height: size
                    , 200
                    , ->
                        $('body').css 'overflow', 'auto'
                        $(@).css 'visibility', 'visible' # In case the user trigger hide/show really fast
                        $('.arrow_history').show() # In case the user trigger hide/show really fast
                        $('.nano_border').show() # In case the user trigger hide/show really fast
                        $(@).nanoScroller({preventPageScrolling: true})
                        if args?.is_at_bottom is true
                            $('.nano >.content').animate
                                scrollTop: $('.history_list').height()
                                , 300

        # The 3 secrets of French cuisine is butter, butter and butter
        # We desactivate the scrollbar (if there isn't) while animating to have a smoother experience. We´ll put back the scrollbar once the animation is done.
