diff --git a/browse.php b/browse.php
index 6e7407af..f4b6ef3d 100644
--- a/browse.php
+++ b/browse.php
@@ -83,7 +83,7 @@ switch ($_REQUEST['action']) {
         //FIXME: This whole thing is ugly, even though it works.
         $browse->set_sort('count','ASC');
         // This one's a doozy
-        $browse_type = isset($_REQUEST['type']) ? $_REQUEST['type'] : 'song';
+        $browse_type = isset($_REQUEST['type']) ? $_REQUEST['type'] : 'artist';
         $browse->set_simple_browse(false);
         $browse->save_objects(Tag::get_tags($browse_type, 0, 'name'));   // Should add a pager?
         $object_ids = $browse->get_saved();
diff --git a/templates/show_tagcloud.inc.php b/templates/show_tagcloud.inc.php
index 27298d77..bd2901ab 100644
--- a/templates/show_tagcloud.inc.php
+++ b/templates/show_tagcloud.inc.php
@@ -21,9 +21,9 @@
  */
 
 $tag_types = array(
-    'song' => T_('Song'),
-    'album' => T_('Album'),
     'artist' => T_('Artist'),
+    'album' => T_('Album'),
+    'song' => T_('Song'),
     'video' => T_('Video'),
 );
 ?>