diff --git a/core/templatetags/share_tags.py b/core/templatetags/share_tags.py
index 9556e28ac..d92e20213 100644
--- a/core/templatetags/share_tags.py
+++ b/core/templatetags/share_tags.py
@@ -64,21 +64,18 @@ def get_sharer_content(request, object, social_network=None):
     return template[social_network]
 
 
+def _configure_sharer(context):
+    shared_object = context.get("object", "")
+    request = context.get("request")
+    context["sharer"] = get_sharer_content(request, shared_object)
+    return ""
+
+
 @register.simple_tag(takes_context=True)
 def configure_acteur_sharer(context):
-    try:
-        object = context.get("object")
-    except AttributeError:
-        object = None
-    request = context.get("request")
-    context["sharer"] = get_sharer_content(request, object)
+    return _configure_sharer(context)
 
 
 @register.simple_tag(takes_context=True)
 def configure_produit_sharer(context):
-    try:
-        object = context.get("object").produit
-    except AttributeError:
-        object = None
-    request = context.get("request")
-    context["sharer"] = get_sharer_content(request, object)
+    return _configure_sharer(context)
diff --git a/integration_tests/assistant/home.py b/integration_tests/assistant/home.py
index 2e1073c4b..79b5bb03d 100644
--- a/integration_tests/assistant/home.py
+++ b/integration_tests/assistant/home.py
@@ -53,6 +53,11 @@ def test_patchwork(self, get_response, tmp_path):
         )
         assert soup.css.select("[data-testid=patchwork-icon]")[0]
 
+    def test_none_in_modal(self, get_response):
+        response, soup = get_response()
+        modal = soup.find(id="fr-modal-partager-le-site")
+        assert "None" not in modal.get_text()
+
     def test_suggestions(self, get_response, tmp_path):
         produit = ProduitFactory(nom="Coucou le produit")
         synonyme = SynonymeFactory(produit=produit, nom="Youpi le synonyme")
diff --git a/templates/modals/base.html b/templates/modals/base.html
index e3c5cbc8d..3fe0afa39 100644
--- a/templates/modals/base.html
+++ b/templates/modals/base.html
@@ -1,6 +1,6 @@
 {% block modal_wrapper_for_id %}
 <button
-    class="fr-btn {{ button_extra_classes }}"
+    class="fr-btn {{ button_extra_classes }} qf-whitespace-nowrap"
     data-fr-opened="false"
     aria-controls="fr-modal-{{ id }}"
     aria-labelledby="sidebar-action-{{ id }}"