diff --git a/templates/admin/tool_shed_repository/common.mako b/templates/admin/tool_shed_repository/common.mako
index a3f18dbea23..8885bad1ae5 100644
--- a/templates/admin/tool_shed_repository/common.mako
+++ b/templates/admin/tool_shed_repository/common.mako
@@ -1,3 +1,4 @@
+<%namespace file="/webapps/tool_shed/common/common.mako" import="*" />
 <%namespace file="/webapps/tool_shed/repository/common.mako" import="*" />
 
 <%def name="browse_files(title_text, directory_path)">
@@ -148,7 +149,7 @@
                 %else:
                     <label>Handle repository dependencies?</label>
                 %endif
-                ${repository_dependencies_check_box.get_html()}
+                ${render_checkbox(repository_dependencies_check_box)}
                 <div class="toolParamHelp" style="clear: both;">
                     %if export:
                         Select to export the following additional repositories that are required by this repository.
@@ -185,7 +186,7 @@
             <div class="form-row">
                 <label>When available, install Tool Shed managed tool dependencies?</label>
                 <% disabled = trans.app.config.tool_dependency_dir is None %>
-                ${install_tool_dependencies_check_box.get_html( disabled=disabled )}
+                ${render_checkbox(install_tool_dependencies_check_box, disabled=disabled)}
                 <div class="toolParamHelp" style="clear: both;">
                     %if disabled:
                         Set the tool_dependency_dir configuration value in your Galaxy config to automatically handle tool dependencies.
diff --git a/templates/webapps/tool_shed/repository/common.mako b/templates/webapps/tool_shed/repository/common.mako
index 65fc9f93fb8..3ccf893fee0 100644
--- a/templates/webapps/tool_shed/repository/common.mako
+++ b/templates/webapps/tool_shed/repository/common.mako
@@ -1,3 +1,4 @@
+<%namespace file="/webapps/tool_shed/common/common.mako" import="*" />
 <%def name="common_javascripts(repository)">
     <script type="text/javascript">
         $(function(){
@@ -195,7 +196,7 @@
                 </div>
             %endif
         %else:
-            ${repository_type_select_field.get_html()}
+            ${render_select(repository_type_select_field)}
             %if render_help:
                 <div class="toolParamHelp" style="clear: both;">
                     Select the repository type based on the following criteria.