diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html
index d31ce613a..aff9f5dab 100644
--- a/src/registrar/templates/domain_sidebar.html
+++ b/src/registrar/templates/domain_sidebar.html
@@ -34,7 +34,7 @@
             >
                 DNSSEC
             </a>
-            {% if domain.dnssec_enabled %}
+            {% if domain.dnssecdata is not None or request.path|startswith:url and request.path|endswith:'data' %}
             <ul class="usa-sidenav__sublist">
               <li class="usa-sidenav__item">
                 {% url 'domain-dns-dnssec-dsdata' pk=domain.id as url %}
diff --git a/src/registrar/templatetags/field_helpers.py b/src/registrar/templatetags/field_helpers.py
index c62cb10aa..bc296753e 100644
--- a/src/registrar/templatetags/field_helpers.py
+++ b/src/registrar/templatetags/field_helpers.py
@@ -149,7 +149,7 @@ def input_with_errors(context, field=None):  # noqa: C901
     # see Widget.get_context() on
     # https://docs.djangoproject.com/en/4.1/ref/forms/widgets
     widget = field.field.widget.get_context(
-        field.html_name, field.value() or field.initial, field.build_widget_attrs(attrs)
+        field.html_name, field.value(), field.build_widget_attrs(attrs)
     )  # -> {"widget": {"name": ...}}
 
     context["widget"] = widget["widget"]
diff --git a/src/registrar/templatetags/url_helpers.py b/src/registrar/templatetags/url_helpers.py
index 5b76c116f..2b983930f 100644
--- a/src/registrar/templatetags/url_helpers.py
+++ b/src/registrar/templatetags/url_helpers.py
@@ -18,6 +18,11 @@ def startswith(text, starts):
         return text.startswith(starts)
     return False
 
+@register.filter("endswith")
+def endswith(text, ends):
+    if isinstance(text, str):
+        return text.endswith(ends)
+    return False
 
 @register.simple_tag
 def public_site_url(url_path):