diff --git a/templates/webapps/tool_shed/repository/manage_repository.mako b/templates/webapps/tool_shed/repository/manage_repository.mako
index 3982b68a48e..54c41dc2870 100644
--- a/templates/webapps/tool_shed/repository/manage_repository.mako
+++ b/templates/webapps/tool_shed/repository/manage_repository.mako
@@ -190,16 +190,20 @@ ${render_tool_shed_repository_actions( repository, metadata=metadata, changeset_
                 %endif
                 <div style="clear: both"></div>
             </div>
+            %if repository.homepage_url:
             <div class="form-row">
                 <b>Content homepage:</b>
                 <input name="homepage_url" type="textfield" value="${homepage_url | h}" size="80"/>
                 <div style="clear: both"></div>
             </div>
+            %endif
+            %if repository.remote_repository_url:
             <div class="form-row">
                 <b>Development repository:</b>
                 <input name="remote_repository_url" type="textfield" value="${remote_repository_url | h}" size="80"/>
                 <div style="clear: both"></div>
             </div>
+            %endif
             <div class="form-row">
                 <b>${sharable_link_label}</b>
                 <a href="${ repository.share_url }" target="_blank">${ repository.share_url }</a>
diff --git a/templates/webapps/tool_shed/repository/view_repository.mako b/templates/webapps/tool_shed/repository/view_repository.mako
index 15c164d7147..07d1e98f415 100644
--- a/templates/webapps/tool_shed/repository/view_repository.mako
+++ b/templates/webapps/tool_shed/repository/view_repository.mako
@@ -123,14 +123,18 @@
                 ## ${render_long_description( to_html_string( repository.long_description ) )}
             </div>
         %endif
+        %if repository.homepage_url:
         <div class="form-row">
             <b>Content homepage:</b>
             <a href="${repository.homepage_url | h}" target="_blank">${repository.homepage_url | h}</a>
         </div>
+        %endif
+        %if repository.remote_repository_url:
         <div class="form-row">
             <b>Development repository:</b>
             <a href="${repository.remote_repository_url | h}" target="_blank">${repository.remote_repository_url | h}</a>
         </div>
+        %endif
         <div class="form-row">
             <b>${sharable_link_label}</b>
             <a href="${ repository.share_url }" target="_blank">${ repository.share_url }</a>