diff --git a/hypha/apply/activity/context_processors.py b/hypha/apply/activity/context_processors.py
index 975680a3c1a58d4bec894d1d395eb519410fe01c..1522f47ea37d6e69bca5c8a995e141513a205e78 100644
--- a/hypha/apply/activity/context_processors.py
+++ b/hypha/apply/activity/context_processors.py
@@ -5,5 +5,5 @@ def notification_context(request):
     context_data = dict()
     if hasattr(request, 'user'):
         if request.user.is_authenticated and request.user.is_apply_staff:
-            context_data['latest_notifications'] = Activity.objects.latest().order_by('-timestamp')[:5]
+            context_data['latest_notifications'] = Activity.objects.filter(current=True).latest().order_by('-timestamp')[:5]
     return context_data
diff --git a/hypha/apply/activity/views.py b/hypha/apply/activity/views.py
index 0af55e2b554adbd9aa64bce00b9415388a0cdf3c..1a1be200ff95ef1f74e4b8afec919bb099955455 100644
--- a/hypha/apply/activity/views.py
+++ b/hypha/apply/activity/views.py
@@ -70,7 +70,7 @@ class NotificationsView(ListView):
 
     def get_queryset(self):
         # List only last 30 days' activities
-        queryset = Activity.objects.latest()
+        queryset = Activity.objects.filter(current=True).latest()
         self.filterset = self.filterset_class(self.request.GET, queryset=queryset)
         return self.filterset.qs.distinct().order_by('-timestamp')
 
diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html
index a6dd508b9754efc2883be5c2bc20344e8b583551..84499228fdad68aa972f958e42a575a3701bd4ee 100644
--- a/hypha/apply/projects/templates/application_projects/project_detail.html
+++ b/hypha/apply/projects/templates/application_projects/project_detail.html
@@ -243,6 +243,7 @@
 
 {% block extra_js %}
     <script src="{% static 'js/apply/tabs.js' %}"></script>
+    <script src="{% static 'js/apply/edit-comment.js' %}"></script>
     <script src="{% static 'js/apply/toggle-payment-block.js' %}"></script>
     <script src="{% static 'js/apply/past-reports-pagination.js' %}"></script>
     <script src="{% static 'js/apply/report-calculator.js' %}"></script>