diff --git a/app/presenters/tree_builder.rb b/app/presenters/tree_builder.rb
index 9c17c33ea591..4ae3cff2eb40 100644
--- a/app/presenters/tree_builder.rb
+++ b/app/presenters/tree_builder.rb
@@ -147,6 +147,7 @@ def build_tree
   # Subclass this method if active node on initial load is different than root node.
   def active_node_set(tree_nodes)
     @tree_state.x_node_set(tree_nodes.first[:key], @name) unless @tree_state.x_node(@name)
+    @tree_state.x_node(@name)
   end
 
   def set_nodes(nodes)
diff --git a/app/presenters/tree_builder_roles_by_server.rb b/app/presenters/tree_builder_roles_by_server.rb
index ab31a1157b5f..2d4bb00d636a 100644
--- a/app/presenters/tree_builder_roles_by_server.rb
+++ b/app/presenters/tree_builder_roles_by_server.rb
@@ -3,10 +3,29 @@ class TreeBuilderRolesByServer < TreeBuilderDiagnostics
 
   private
 
+  def tree_init_options(_tree_name)
+    {:add_root => false,
+     :expand   => true,
+     :lazy     => false,
+     :open_all => true,
+     :activate_silently => true
+    }
+  end
+
   def x_get_tree_roots(_count_only, _options)
     x_get_tree_miq_servers
   end
 
+  def override(node, object, _pid, options)
+    if (@sb[:diag_selected_id] && node[:key] == "svr-#{@sb[:diag_selected_id]}")
+      node[:highlighted] = true
+    end
+  end
+
+  def active_node_set(tree_nodes)
+    @tree_state.x_node_set(tree_nodes.first[:key], @name) unless @tree_state.x_node(@name)
+  end
+
   def x_get_tree_miq_servers
     @root.miq_servers.sort_by { |s| s.name.to_s }.each_with_object([]) do |server, objects|
       unless @sb[:diag_selected_id] # Set default selected record vars