diff --git a/files/helpers/config/modaction_types.py b/files/helpers/config/modaction_types.py
index abe01ebeb..a89eaec9d 100644
--- a/files/helpers/config/modaction_types.py
+++ b/files/helpers/config/modaction_types.py
@@ -196,6 +196,16 @@ MODACTION_TYPES = {
 		"icon": 'fa-thumbtack fa-rotate--45',
 		"color": 'bg-success'
 	},
+	'progstack_comment': {
+		"str": 'Applied progressive stack on {self.target_link}',
+		"icon": 'fa-bullhorn',
+		"color": 'bg-success'
+	},
+	'progstack_post': {
+		"str": 'Applied progressive stack on post {self.target_link}',
+		"icon": 'fa-bullhorn',
+		"color": 'bg-success'
+	},
 	'clear_cloudflare_cache': {
 		"str": 'cleared cloudflare cache',
 		"icon": 'fab fa-cloudflare',
@@ -335,6 +345,7 @@ MODACTION_TYPES = {
 
 MODACTION_PRIVILEGED_TYPES = {'shadowban', 'unshadowban',
 							'mod_mute_user', 'mod_unmute_user',
-							'link_accounts', 'delink_accounts'}
+							'link_accounts', 'delink_accounts',
+							'progstack_post', 'progstack_comment'}
 MODACTION_TYPES_FILTERED = deepcopy({t:v for t,v in MODACTION_TYPES.items()
                                      if not t in MODACTION_PRIVILEGED_TYPES})
diff --git a/files/routes/admin.py b/files/routes/admin.py
index 37275122e..af0b6c831 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -22,7 +22,7 @@ from files.routes.routehelpers import check_for_alts
 from files.routes.wrappers import *
 from files.routes.routehelpers import get_alt_graph, get_alt_graph_ids
 
-from .front import frontlist
+from .front import frontlist, comment_idlist
 
 @app.get('/admin/loggedin')
 @limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID)
@@ -1121,17 +1121,45 @@ def unmute_user(v:User, user_id):
 
 	return {"message": f"@{user.username} has been unmuted!"}
 
-@app.post("/admin/progstack/<int:post_id>")
+@app.post("/admin/progstack/post/<int:post_id>")
 @limiter.limit(DEFAULT_RATELIMIT_SLOWER)
 @limiter.limit(DEFAULT_RATELIMIT_SLOWER, key_func=get_ID)
 @admin_level_required(PERMS['PROGSTACK'])
-def progstack(post_id, v):
+def progstack_post(post_id, v):
 	post = get_post(post_id)
 	post.is_approved = PROGSTACK_ID
 	post.realupvotes = floor(post.realupvotes * PROGSTACK_MUL)
 	g.db.add(post)
+
+	ma=ModAction(
+		kind="progstack_post",
+		user_id=v.id,
+		target_submission_id=post.id,
+		)
+	g.db.add(ma)
+
 	cache.delete_memoized(frontlist)
-	return {"message": "Progressive stack applied!"}
+	return {"message": "Progressive stack applied on post!"}
+
+@app.post("/admin/progstack/comment/<int:comment_id>")
+@limiter.limit(DEFAULT_RATELIMIT_SLOWER)
+@limiter.limit(DEFAULT_RATELIMIT_SLOWER, key_func=get_ID)
+@admin_level_required(PERMS['PROGSTACK'])
+def progstack_comment(comment_id, v):
+	comment = get_comment(comment_id)
+	comment.is_approved = PROGSTACK_ID
+	comment.realupvotes = floor(comment.realupvotes * PROGSTACK_MUL)
+	g.db.add(comment)
+
+	ma=ModAction(
+		kind="progstack_comment",
+		user_id=v.id,
+		target_comment_id=comment.id,
+		)
+	g.db.add(ma)
+
+	cache.delete_memoized(comment_idlist)
+	return {"message": "Progressive stack applied on comment!"}
 
 @app.post("/remove_post/<int:post_id>")
 @limiter.limit(DEFAULT_RATELIMIT_SLOWER)
diff --git a/files/templates/comments.html b/files/templates/comments.html
index b15a1ad94..223de96f2 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -456,6 +456,10 @@
 	{% endif %}
 {% endif %}
 
+{% if v.admin_level >= PERMS['PROGSTACK'] %}
+	<button type="button" id="progstack-{{c.id}}" class="dropdown-item list-inline-item d-none {% if c.is_approved != PROGSTACK_ID %}d-md-block{% endif %} text-danger" data-nonce="{{g.nonce}}" data-onclick="postToast(this,'/admin/progstack/comment/{{c.id}}'"><i class="fas fa-bullhorn text-danger fa-fw"></i>Apply Progressive Stack</button>
+{% endif %}
+
 {% if (c.parent_submission or c.wall_user_id) and (c.author_id==v.id or v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or (c.post.sub and v.mods(c.post.sub))) %}
 	<button type="button" id="unmark-{{c.id}}" class="dropdown-item list-inline-item d-none {% if c.over_18 %}d-md-block{% endif %} text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/toggle_comment_nsfw/{{c.id}}','mark-{{c.id}}','unmark-{{c.id}}','d-md-block')"><i class="fas fa-eye-evil text-success fa-fw"></i>Unmark +18</button>
 	<button type="button" id="mark-{{c.id}}" class="dropdown-item list-inline-item d-none {% if not c.over_18 %}d-md-block{% endif %} text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/toggle_comment_nsfw/{{c.id}}','mark-{{c.id}}','unmark-{{c.id}}','d-md-block')"><i class="fas fa-eye-evil text-danger fa-fw"></i>Mark +18</button>
@@ -657,6 +661,10 @@
 							<button type="button" id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-success mr-2"></i>Unmark +18</button>
 						{% endif %}
 
+						{% if v.admin_level >= PERMS['PROGSTACK'] %}
+							<button type="button" id="progstack2-{{c.id}}" class="{% if c.is_approved == PROGSTACK_ID %}d-none{% endif %} list-group-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToast(this,'/admin/progstack/comment/{{c.id}}'" data-bs-dismiss="modal"><i class="fas fa-bullhorn text-danger fa-fw mr-2"></i>Apply Progressive Stack</button>
+						{% endif %}
+
 						{% if v.id != c.author_id and v.admin_level >= PERMS['USER_BAN'] %}
 							<button type="button" id="ban2-{{c.fullname}}" class="{% if c.author.is_banned %}d-none{% endif %} list-group-item text-danger" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" data-nonce="{{g.nonce}}" data-onclick="banModal('/comment/{{c.id}}', '{{c.author_name}}', '{{c.fullname}}','d-none')" ><i class="fas fa-user-slash text-danger fa-fw mr-2"></i>Ban user</button>
 							<button type="button" id="unban2-{{c.fullname}}" class="{% if not c.author.is_banned %}d-none{% endif %} list-group-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unban_user/{{c.fullname}}','ban2-{{c.fullname}}','unban2-{{c.fullname}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-user-minus fa-fw text-success mr-2"></i>Unban user</button>
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index feab586b1..2da399e26 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -83,7 +83,7 @@
 			<button type="button" id="unmark-{{p.id}}" class="dropdown-item {% if not p.over_18 %}d-none{% endif %} list-inline-item text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unmark_post_nsfw/{{p.id}}','mark-{{p.id}}','unmark-{{p.id}}','d-none')"><i class="fas fa-eye-evil"></i>Unmark +18</button>
 		{% endif %}
 		{% if v.admin_level >= PERMS['PROGSTACK'] %}
-			<button type="button" id="progstack-{{p.id}}" class="dropdown-item {% if p.is_approved == PROGSTACK_ID %}d-none{% endif %} list-inline-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToast(this,'/admin/progstack/{{p.id}}'"><i class="fas fa-bullhorn"></i>Apply Progressive Stack</button>
+			<button type="button" id="progstack-{{p.id}}" class="dropdown-item {% if p.is_approved == PROGSTACK_ID %}d-none{% endif %} list-inline-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToast(this,'/admin/progstack/post/{{p.id}}'"><i class="fas fa-bullhorn"></i>Apply Progressive Stack</button>
 		{% endif %}
 		{% if v.admin_level >= PERMS['USER_BAN'] and v.id != p.author_id %}
 			<button type="button" id="ban-{{p.fullname}}" class="dropdown-item {% if p.author.is_suspended %}d-none{% endif %} list-inline-item text-danger" data-bs-toggle="modal" data-bs-target="#banModal" data-nonce="{{g.nonce}}" data-onclick="banModal('/post/{{p.id}}', '{{p.author_name}}', '{{p.fullname}}','d-none')"><i class="fas fa-user-slash text-danger fa-fw"></i>Ban user</button>
diff --git a/files/templates/post_admin_actions_mobile.html b/files/templates/post_admin_actions_mobile.html
index db41ebf14..8f0d46034 100644
--- a/files/templates/post_admin_actions_mobile.html
+++ b/files/templates/post_admin_actions_mobile.html
@@ -37,7 +37,7 @@
 						<button type="button" id="unmark2-{{p.id}}" class="{% if not p.over_18 %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-success" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unmark_post_nsfw/{{p.id}}','mark2-{{p.id}}','unmark2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="far fa-eye-evil text-center text-success mr-2"></i>Unmark +18</button>
 					{% endif %}
 					{% if v.admin_level >= PERMS['PROGSTACK'] %}
-						<button type="button" id="progstack2-{{p.id}}" class="{% if p.is_approved == PROGSTACK_ID %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" data-nonce="{{g.nonce}}" data-onclick="postToast(this,'/admin/progstack/{{p.id}}'" data-bs-dismiss="modal"><i class="fas fa-bullhorn text-center text-danger mr-2"></i>Apply Progressive Stack</button>
+						<button type="button" id="progstack2-{{p.id}}" class="{% if p.is_approved == PROGSTACK_ID %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" data-nonce="{{g.nonce}}" data-onclick="postToast(this,'/admin/progstack/post/{{p.id}}'" data-bs-dismiss="modal"><i class="fas fa-bullhorn text-center text-danger mr-2"></i>Apply Progressive Stack</button>
 					{% endif %}
 					{% if v.id != p.author_id and v.admin_level >= PERMS['USER_BAN'] %}
 						<button type="button" id="ban2-{{p.fullname}}" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" data-nonce="{{g.nonce}}" data-onclick="banModal('/post/{{p.id}}', '{{p.author_name}}', '{{p.fullname}}','d-none')" class="{% if p.author.is_suspended %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-danger text-left"><i class="fas fa-user-minus mr-2"></i>Ban user</button>