diff --git a/files/classes/comment.py b/files/classes/comment.py
index 3ccf1c0e7..957741f0e 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -562,3 +562,8 @@ class Comment(Base):
 
 		body += '</span>'
 		return body
+
+
+	@lazy
+	def is_saved(self, v):
+		return g.db.query(SaveRelationship).filter_by(user_id=v.id, submission_id=self.id).first()
\ No newline at end of file
diff --git a/files/classes/submission.py b/files/classes/submission.py
index 584259fb2..5ab95d88b 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -501,4 +501,9 @@ class Submission(Base):
 		return False
 
 	@lazy
-	def active_flags(self, v): return len(self.flags(v))
\ No newline at end of file
+	def active_flags(self, v):
+		return len(self.flags(v))
+
+	@lazy
+	def is_saved(self, v):
+		return g.db.query(CommentSaveRelationship).filter_by(user_id=v.id, comment_id=self.id).first()
\ No newline at end of file
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index fd6a3328d..8ae3f3ef0 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -20,8 +20,8 @@
 {% endif %}
 
 {% if v %}
-	<a id="save-{{p.id}}" class="{% if p.id in v.saved_idlist() %}d-none{% endif %} list-inline-item" role="button" onclick="post_toast(this,'/save_post/{{p.id}}','save-{{p.id}}','unsave-{{p.id}}','d-none')"><i class="fas fa-save"></i>Save</a>
-	<a id="unsave-{{p.id}}" class="{% if not p.id in v.saved_idlist() %}d-none{% endif %} list-inline-item" role="button" onclick="post_toast(this,'/unsave_post/{{p.id}}','save-{{p.id}}','unsave-{{p.id}}','d-none')"><i class="fas fa-save"></i>Unsave</a>
+	<a id="save-{{p.id}}" class="{% if p.is_saved(v) %}d-none{% endif %} list-inline-item" role="button" onclick="post_toast(this,'/save_post/{{p.id}}','save-{{p.id}}','unsave-{{p.id}}','d-none')"><i class="fas fa-save"></i>Save</a>
+	<a id="unsave-{{p.id}}" class="{% if not p.is_saved(v) %}d-none{% endif %} list-inline-item" role="button" onclick="post_toast(this,'/unsave_post/{{p.id}}','save-{{p.id}}','unsave-{{p.id}}','d-none')"><i class="fas fa-save"></i>Unsave</a>
 	
 	<a class="list-inline-item" role="button" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#reportPostModal" onclick="report_postModal('{{p.id}}')"><i class="fas fa-flag"></i>Report</a>
 {% endif %}
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index f01ee5a61..f5e655155 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -17,8 +17,8 @@
 <button id="subscribe2-{{p.id}}" class="{% if p.id in v.subscribed_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" role="button" onclick="post_toast(this,'/subscribe/{{p.id}}','subscribe2-{{p.id}}','unsubscribe2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye text-center text-muted mr-3"></i>Subscribe</button>
 <button id="unsubscribe2-{{p.id}}" class="{% if not p.id in v.subscribed_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" role="button" onclick="post_toast(this,'/unsubscribe/{{p.id}}','subscribe2-{{p.id}}','unsubscribe2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye-slash text-center text-muted mr-3"></i>Unsubscribe</button>
 
-<button id="save2-{{p.id}}" class="{% if p.id in v.saved_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" role="button" onclick="post_toast(this,'/save_post/{{p.id}}','save2-{{p.id}}','unsave2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-save text-center text-muted mr-3"></i>Save</button>
-<button id="unsave2-{{p.id}}" class="{% if not p.id in v.saved_idlist() %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" role="button" onclick="post_toast(this,'/unsave_post/{{p.id}}','save2-{{p.id}}','unsave2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-save text-center text-muted mr-3"></i>Unsave</button>
+<button id="save2-{{p.id}}" class="{% if p.is_saved(v) %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" role="button" onclick="post_toast(this,'/save_post/{{p.id}}','save2-{{p.id}}','unsave2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-save text-center text-muted mr-3"></i>Save</button>
+<button id="unsave2-{{p.id}}" class="{% if not p.is_saved(v) %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-muted" role="button" onclick="post_toast(this,'/unsave_post/{{p.id}}','save2-{{p.id}}','unsave2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-save text-center text-muted mr-3"></i>Unsave</button>
 
 
 {% if v.id==p.author_id %}