diff --git a/ui/src/album/AlbumList.js b/ui/src/album/AlbumList.js
index 50fac62cc..7a9c56b0f 100644
--- a/ui/src/album/AlbumList.js
+++ b/ui/src/album/AlbumList.js
@@ -58,12 +58,6 @@ const getPerPageOptions = (width) => {
 const AlbumList = (props) => {
   const { width } = props
   const albumView = useSelector((state) => state.albumView)
-  let sort
-  if (albumView.mode === ALBUM_MODE_LIST) {
-    sort = { field: 'name', order: 'ASC' }
-  } else {
-    sort = { field: 'created_at', order: 'DESC' }
-  }
   return (
     <List
       {...props}
@@ -73,7 +67,7 @@ const AlbumList = (props) => {
       exporter={false}
       bulkActionButtons={false}
       actions={<AlbumListActions />}
-      sort={sort}
+      sort={{ field: 'created_at', order: 'DESC' }}
       filters={<AlbumFilter />}
       perPage={getPerPage(width)}
       pagination={<Pagination rowsPerPageOptions={getPerPageOptions(width)} />}
diff --git a/ui/src/album/AlbumListActions.js b/ui/src/album/AlbumListActions.js
index 3834391e6..00b219d8b 100644
--- a/ui/src/album/AlbumListActions.js
+++ b/ui/src/album/AlbumListActions.js
@@ -42,13 +42,6 @@ const AlbumListActions = ({
         color="primary"
         aria-label="text primary button group"
       >
-        <Button
-          size="small"
-          color={albumView.mode === ALBUM_MODE_LIST ? 'primary' : 'secondary'}
-          onClick={() => dispatch(selectViewMode(ALBUM_MODE_LIST))}
-        >
-          <ViewHeadlineIcon fontSize="inherit" />
-        </Button>
         <Button
           size="small"
           color={albumView.mode === ALBUM_MODE_GRID ? 'primary' : 'secondary'}
@@ -56,6 +49,13 @@ const AlbumListActions = ({
         >
           <ViewModuleIcon fontSize="inherit" />
         </Button>
+        <Button
+          size="small"
+          color={albumView.mode === ALBUM_MODE_LIST ? 'primary' : 'secondary'}
+          onClick={() => dispatch(selectViewMode(ALBUM_MODE_LIST))}
+        >
+          <ViewHeadlineIcon fontSize="inherit" />
+        </Button>
       </ButtonGroup>
     </TopToolbar>
   )
diff --git a/ui/src/album/albumState.js b/ui/src/album/albumState.js
index c1792754b..f00bc05f2 100644
--- a/ui/src/album/albumState.js
+++ b/ui/src/album/albumState.js
@@ -22,7 +22,7 @@ const selectAlbumList = (mode) => ({ type: mode })
 
 const albumViewReducer = (
   previousState = {
-    mode: ALBUM_MODE_LIST,
+    mode: ALBUM_MODE_GRID,
     list: ALBUM_LIST_ALL,
     params: { sort: {}, filter: {} },
   },