diff --git a/app/views/closet_hangers/petpage.html.haml b/app/views/closet_hangers/petpage.html.haml
index 4cf6caf9..83ef3d0a 100644
--- a/app/views/closet_hangers/petpage.html.haml
+++ b/app/views/closet_hangers/petpage.html.haml
@@ -7,22 +7,23 @@
   %p= twl '.instructions',
         :edit_petpage_link_url => 'https://www.neopets.com/edithomepage.phtml'
 
-= form_tag petpage_user_closet_hangers_path(@user), :method => :get, :id => 'petpage-closet-lists' do
-  = hidden_field_tag 'filter', '1'
-  - @closet_lists_by_owned.each do |owned, closet_lists|
-    %div
-      %h4= closet_lists_group_name(:you, owned)
-      %ul
-        - closet_lists.each do |closet_list|
-          %li
+- unless @closet_lists_by_owned.values.all?(&:empty?)
+  = form_tag petpage_user_closet_hangers_path(@user), :method => :get, :id => 'petpage-closet-lists' do
+    = hidden_field_tag 'filter', '1'
+    - @closet_lists_by_owned.each do |owned, closet_lists|
+      %div
+        %h4= closet_lists_group_name(:you, owned)
+        %ul
+          - closet_lists.each do |closet_list|
+            %li
+              = label_tag do
+                = check_box_tag "lists[#{closet_list.id}]", '1', petpage_closet_list_checked(closet_list, owned)
+                = closet_list.name
+          %li.unlisted
             = label_tag do
-              = check_box_tag "lists[#{closet_list.id}]", '1', petpage_closet_list_checked(closet_list, owned)
-              = closet_list.name
-        %li.unlisted
-          = label_tag do
-            = check_box_tag "groups[#{owned}]", '1', petpage_group_checked(owned)
-            = t 'closet_lists.unlisted_name'
-  = submit_tag t('.submit')
+              = check_box_tag "groups[#{owned}]", '1', petpage_group_checked(owned)
+              = t 'closet_lists.unlisted_name'
+    = submit_tag t('.submit')
 
 %textarea#petpage-output
   = '' + render('petpage_content',