diff --git a/apps/addons/models.py b/apps/addons/models.py
index b708034dda..57f687dfce 100644
--- a/apps/addons/models.py
+++ b/apps/addons/models.py
@@ -413,8 +413,8 @@ class Persona(caching.CachingMixin, models.Model):
     submit = models.DateTimeField(null=True)
     approve = models.DateTimeField(null=True)
 
-    movers = models.FloatField(null=True)
-    popularity = models.IntegerField(null=False, default=0)
+    movers = models.FloatField(null=True, db_index=True)
+    popularity = models.IntegerField(null=False, default=0, db_index=True)
     license = models.ForeignKey('versions.License', null=True)
 
     objects = caching.CachingManager()
diff --git a/migrations/40-personas-indexes.sql b/migrations/40-personas-indexes.sql
new file mode 100644
index 0000000000..824d830065
--- /dev/null
+++ b/migrations/40-personas-indexes.sql
@@ -0,0 +1,3 @@
+-- Make personas queries faster
+CREATE INDEX `personas_movers_idx` ON personas (movers);
+CREATE INDEX `personas_popularity_idx` ON personas (popularity);