diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py
index 85eed1d2..d0d0a8e7 100644
--- a/src/octoprint/server/__init__.py
+++ b/src/octoprint/server/__init__.py
@@ -106,10 +106,7 @@ def index():
 		asset_plugin_urls[name] = implementation.get_assets()
 
 	template_plugins = pluginManager.get_implementations(octoprint.plugin.TemplatePlugin)
-	template_plugin_names = list()
-	for name in template_plugins.items():
-		template_plugin_names.append(name[0])
-
+	template_plugin_names = template_plugins.keys()
 
 	return render_template(
 		"index.jinja2",
diff --git a/src/octoprint/templates/index.jinja2 b/src/octoprint/templates/index.jinja2
index e7942fee..e1aed158 100644
--- a/src/octoprint/templates/index.jinja2
+++ b/src/octoprint/templates/index.jinja2
@@ -654,7 +654,6 @@
         {% endif %}
         <!-- End plugin template files -->
 
-
         <script type="text/javascript" src="{{ url_for('static', filename='js/lib/jquery/jquery.min.js') }}"></script>
         <script type="text/javascript" src="{{ url_for('static', filename='js/lib/modernizr.custom.js') }}"></script>
         <script type="text/javascript" src="{{ url_for('static', filename='js/lib/underscore-min.js') }}"></script>