diff --git a/app/assets/javascripts/metamaps/Metamaps.js b/app/assets/javascripts/metamaps/Metamaps.js
index be08684d..067ba7b0 100644
--- a/app/assets/javascripts/metamaps/Metamaps.js
+++ b/app/assets/javascripts/metamaps/Metamaps.js
@@ -2248,8 +2248,8 @@ Metamaps.Filter = {
 
         if (Metamaps.Active.Map) {
             onMap = true;
-            passesMapper = true;
-        }      
+        }
+        else passesMapper = true; // for when you're on a topic page
 
         Metamaps.Topics.each(function(topic) {
             var n = topic.get('node');
diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
index fe7de0fe..a055f11a 100644
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -11,7 +11,14 @@ class MainController < ApplicationController
     @current = current_user
    
     respond_to do |format|
-        format.html { respond_with(@current) }
+        format.html { 
+          if authenticated?
+            @maps = Map.order("name ASC").find_all_by_user_id(@current.id)
+            respond_with(@maps, @current) 
+          else 
+            respond_with(@current) 
+          end
+        }
     end
   end