diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 407005d8adf..4c6cf3417e8 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -76,6 +76,8 @@ class Dispatcher
         shortcut_handler = new ShortcutsNavigation()
       when 'projects:show'
         shortcut_handler = new ShortcutsNavigation()
+
+        new TreeView() if $('#tree-slider').length
       when 'groups:show'
         new Activities()
         shortcut_handler = new ShortcutsNavigation()
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index a8f091819ca..00df1c9c965 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -64,9 +64,9 @@ class Projects::RefsController < Projects::ApplicationController
       }
     end
 
-    if @logs.present?
-      @log_url = namespace_project_tree_url(@project.namespace, @project, tree_join(@ref, @path || '/'))
-      @more_log_url = logs_file_namespace_project_ref_path(@project.namespace, @project, @ref, @path || '', offset: (@offset +  @limit))
+    offset = (@offset + @limit)
+    if contents.size > offset
+      @more_log_url = logs_file_namespace_project_ref_path(@project.namespace, @project, @ref, @path || '', offset: offset)
     end
 
     respond_to do |format|
diff --git a/app/views/projects/refs/logs_tree.js.haml b/app/views/projects/refs/logs_tree.js.haml
index db7f244d002..8ee2aef0e61 100644
--- a/app/views/projects/refs/logs_tree.js.haml
+++ b/app/views/projects/refs/logs_tree.js.haml
@@ -8,12 +8,9 @@
     row.find("td.tree_time_ago").html('#{escape_javascript time_ago_with_tooltip(commit.committed_date)}');
     row.find("td.tree_commit").html('#{escape_javascript render("projects/tree/tree_commit_column", commit: commit)}');
 
-- if @logs.present?
+- if @more_log_url
   :plain
-    var current_url = location.href.replace(/\/?$/, '/');
-    var log_url = "#{escape_javascript(@log_url)}".replace(/\/?$/, '/');
-
-    if(current_url == log_url) {
+    if($('#tree-slider').length) {
       // Load more commit logs for each file in tree
       // if we still on the same page
       var url = "#{escape_javascript(@more_log_url)}";