diff --git a/media/css/style.css b/media/css/style.css
index cf2320d..47f96c2 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -742,6 +742,9 @@ article.snipt.blog-post div.container header {
   -moz-box-shadow: inset 0 -1px 0 #e3e9f5;
   box-shadow: inset 0 -1px 0 #e3e9f5;
 }
+article.snipt.snipt-expand div.container section.code {
+  height: auto;
+}
 
 article.private-snipt div.container header {
   background: #7f7f7f url("/static/images/private-icon.png") top right no-repeat;
diff --git a/media/css/style.scss b/media/css/style.scss
index 6675fb5..28e2a3f 100644
--- a/media/css/style.scss
+++ b/media/css/style.scss
@@ -852,6 +852,13 @@ article.snipt {
             }
         }
     }
+    &.snipt-expand {
+        div.container {
+            section.code {
+                height: auto;
+            }
+        }
+    }
 }
 article.private-snipt {
     div.container {
diff --git a/snipts/templates/snipts/snipt-list.html b/snipts/templates/snipts/snipt-list.html
index 2fb8e62..00e499a 100644
--- a/snipts/templates/snipts/snipt-list.html
+++ b/snipts/templates/snipts/snipt-list.html
@@ -2,7 +2,7 @@
 
 {% snipt_is_favorited_by_user as 'is_favorited' %}
 
-<article id="snipt-{{ snipt.pk }}" class="snipt {% if snipt.blog_post %}blog-post {% endif %}{% if not snipt.public %} private-snipt{% endif %}{% if snipt.line_count > 8 and not detail %} expandable{% endif %}{% if snipt.user == request.user %} editable{% endif %}{% if is_favorited %} favorited" data-favorite-id="{{ is_favorited }}"{% else %}"{% endif %}>
+<article id="snipt-{{ snipt.pk }}" class="snipt {% if 'snipt-expand' in snipt.tags_list and snipt.blog_post %}snipt-expand {% endif %}{% if snipt.blog_post %}blog-post {% endif %}{% if not snipt.public %} private-snipt{% endif %}{% if snipt.line_count > 8 and not detail and 'snipt-expand' not in snipt.tags_list %} expandable{% endif %}{% if snipt.user == request.user %} editable{% endif %}{% if is_favorited %} favorited" data-favorite-id="{{ is_favorited }}"{% else %}"{% endif %}>
     <div class="number">#{{ snipt.pk }}</div>
     <div class="group">
         <div class="container">
@@ -21,7 +21,7 @@
                 {% else %}
                     {{ snipt.stylized|safe }}
                 {% endif %}
-                {% if snipt.line_count > 8 and not detail %}
+                {% if snipt.line_count > 8 and not detail and 'snipt-expand' not in snipt.tags_list %}
                     <a href="#" class="expand">
                         <span class="expand">Expand</span>
                         <span class="collapse">Collapse</span>