diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index 14bbeae1a..9d3c407f3 100644
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,7 +1,14 @@
 <h1><%= @heading %></h1>
 <p><%= raw(@description) %></p>
 
-<% if @edits.size > 1 %>
+<% if @edits.size > 0 %>
+  <%= render :partial => 'changeset_paging_nav' %>
+
+  <div id="changeset_list_container">
+    <%= render :partial => 'map' %>
+    <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
+  </div>
+
   <%= render :partial => 'changeset_paging_nav' %>
 <% elsif @user and @user.display_name == params[:display_name] %>
   <%= raw t('changeset.list.empty_user') %>
@@ -9,15 +16,6 @@
   <%= raw t('changeset.list.empty_anon') %>
 <% end %>
 
-<div id="changeset_list_container">
-  <%= render :partial => 'map' %>
-  <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
-</div>
-
-<% if @edits.size > 1 %>
-  <%= render :partial => 'changeset_paging_nav' %>
-<% end %>
-
 <% unless params[:friends] or params[:nearby] -%>
 <%= atom_link_to params.merge({ :page => nil, :action => :feed }) %>