diff --git a/Show/templates/episode.html b/Show/templates/episode.html
index 431fdcf..b0ff05a 100644
--- a/Show/templates/episode.html
+++ b/Show/templates/episode.html
@@ -57,8 +57,11 @@
 	<h1>Watch <q>{{episode.name}}</q> From</h1>
 	<div class="submission-list">
 	{% for sbm in submissions %}
-	<div class="submission{% if sbm.positives < sbm.negatives %} buried{% endif %}">
-		<a href="{{sbm.url}}" class="link"><i class="fa fa-fw fa-globe"></i>&nbsp;{{sbm.url}}</a>
+	<div class="submission{% if sbm.positives < sbm.negatives %} buried{% endif %}{% if sbm.pinned %} pinned{% endif %}">
+		<a href="{{sbm.url}}" class="link">
+			{% if sbm.pinned %}<i class="fa fa-fw fa-thumb-tack" title="Pinned submission"></i>{% endif %}
+			<i class="fa fa-fw fa-globe"></i>&nbsp;{{sbm.url}}
+		</a>
 		<div class="vote-btns" data-vote-id="{{sbm.id}}">
 			<form method="POST" action="/show/{{show.abbr}}/vote/{{sbm.id}}/1">
 				{% csrf_token %}
diff --git a/Show/views.py b/Show/views.py
index 185f1f1..531fef8 100644
--- a/Show/views.py
+++ b/Show/views.py
@@ -76,7 +76,7 @@ class EpisodeView(TemplateView):
                 ),
             negatives=Count('votes') - F('positives'),
             score=F('positives') - F('negatives')
-        ).order_by('-score')
+        ).order_by('-pinned', '-score')
 
         # Add fields to context
         ctx['show'] = show