diff --git a/app/assets/v2/css/grants/fund.css b/app/assets/v2/css/grants/fund.css
index 785c08cfd10..2702bfc24f1 100644
--- a/app/assets/v2/css/grants/fund.css
+++ b/app/assets/v2/css/grants/fund.css
@@ -8,6 +8,9 @@
 #grant-link {
   color: #0D0764;
 }
+.tab_target{
+  width: 100%;
+}
 
 .banner-img {
   max-height: 22rem;
diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 9010de6eab6..125f70774ea 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -307,7 +307,7 @@ const subscribeToGrant = (transactionHash) => {
       $('#transaction_url').attr('href', linkURL);
       enableWaitState('#grants_form');
       // TODO: fix the tweet modal
-      // $('#tweetModal').modal('show');
+       $('#tweetModal').css('display', 'block');
 
       deployedSubscription.methods.extraNonce(accounts[0]).call(function(err, nonce) {
 
@@ -412,7 +412,7 @@ const splitPayment = (account, toFirst, toSecond, valueFirst, valueSecond) => {
     $('#transaction_url').attr('href', linkURL);
     enableWaitState('#grants_form');
     // TODO: Fix tweet modal
-    // $('#tweetModal').modal('show');
+    $('#tweetModal').css('display', 'block');
   }).on('confirmation', function(confirmationNumber, receipt) {
     data = {
       'subscription_hash': 'onetime',
diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
index 1f5cf92563a..d94befad8a8 100644
--- a/app/grants/templates/grants/fund.html
+++ b/app/grants/templates/grants/fund.html
@@ -324,11 +324,11 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>
       </div>
 
     </div>
-    <div class="modal fade" id="tweetModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal" id="tweetModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" style="margin-top: 10px;">
       <div class="modal-dialog" role="document">
         <div class="modal-content">
           <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close" onclick="javascript:$('#tweetModal').remove();">
               <span aria-hidden="true">&times;</span>
             </button>
           </div>
@@ -340,7 +340,7 @@ <h5>Thanks for Contributing!</h5>
             <span>{% trans "Tell your network about this Gitcoin Grant. If they fund a grant, the grant owner will get even more Matching Funds!" %}</span>
           </div>
           <div class="row my-4 justify-content-center">
-            <a class="button button--primary" role="button" href="https://twitter.com/intent/tweet?text=I just funded this grant on Gitcoin.co! https://{{ request.META.HTTP_HOST }}{% url 'grants:details' grant.id grant.slug %}"
+            <a class="button button--primary" role="button" href="https://twitter.com/intent/tweet?text=I just funded this grant on @gitcoin => https://{{ request.META.HTTP_HOST }}{% url 'grants:details' grant.id grant.slug %}"
               target="_blank" rel="noopener noreferrer" OnClick="ga('send', 'event', 'Tweet Button', 'click', 'Grant Funder')">
               {% trans "Tweet About it!" %}
             </a>
@@ -353,6 +353,15 @@ <h5>Thanks for Contributing!</h5>
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
     {% include 'grants/shared/shared_scripts.html' %}
+
+    {% if show_tweet_modal %}
+      <script>
+        $(document).ready(function(){
+           $('#tweetModal').css('display', 'block');
+        });
+      </script>
+    {% endif %}
+
   </body>
 
   <script src="{% static "v2/js/pages/wallet_estimate.js" %}"></script>
diff --git a/app/grants/views.py b/app/grants/views.py
index 56dd5f4880c..3f7bd5b6a63 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -539,12 +539,14 @@ def grant_fund(request, grant_id, grant_slug):
     can_phantom_fund = request.user.is_authenticated and request.user.groups.filter(name='phantom_funders').exists()
     phantom_funds = PhantomFunding.objects.filter(profile=request.user.profile, grant=grant, round_number=round_number)
     is_phantom_funding_this_grant = request.user.is_authenticated and phantom_funds.exists()
+    show_tweet_modal = False
     if can_phantom_fund:
         active_tab = 'phantom'
     if can_phantom_fund and request.GET.get('toggle_phantom_fund'):
         if is_phantom_funding_this_grant:
             msg = "You are now signaling for this grant."
             phantom_funds.delete()
+            show_tweet_modal = True
         else:
             msg = "You are no longer signaling for this grant."
             PhantomFunding.objects.create(grant=grant, profile=request.user.profile, round_number=round_number)
@@ -560,6 +562,7 @@ def grant_fund(request, grant_id, grant_slug):
         'title': _('Fund Grant'),
         'card_desc': _('Provide sustainable funding for Open Source with Gitcoin Grants'),
         'subscription': {},
+        'show_tweet_modal': show_tweet_modal,
         'grant_has_no_token': True if grant.token_address == '0x0000000000000000000000000000000000000000' else False,
         'grant': grant,
         'keywords': get_keywords(),
diff --git a/app/retail/templates/shared/footer_scripts.html b/app/retail/templates/shared/footer_scripts.html
index 7a4d61cfd68..6c44a29d35f 100644
--- a/app/retail/templates/shared/footer_scripts.html
+++ b/app/retail/templates/shared/footer_scripts.html
@@ -32,8 +32,6 @@
 <script src="{% static "v2/js/lib/popper.min.js" %}"></script>
 <script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
 <script>
-  const bootstrapModal = $.fn.modal.noConflict()
-  $.fn.bootstrapModal = bootstrapModal
   const bootstrapTooltip = $.fn.tooltip.noConflict()
   $.fn.bootstrapTooltip = bootstrapTooltip;