diff --git a/lib/ui/home_widget.dart b/lib/ui/home_widget.dart
index ecf627c39..0d891cc03 100644
--- a/lib/ui/home_widget.dart
+++ b/lib/ui/home_widget.dart
@@ -69,16 +69,7 @@ class _HomeWidgetState extends State<HomeWidget> {
           if (snapshot.hasData) {
             return IndexedStack(
               children: <Widget>[
-                Gallery(
-                  _getFilteredPhotos(PhotoRepository.instance.photos),
-                  _selectedPhotos,
-                  photoSelectionChangeCallback: (Set<Photo> selectedPhotos) {
-                    setState(() {
-                      _selectedPhotos = selectedPhotos;
-                    });
-                  },
-                  enablePullToSync: true,
-                ),
+                _getMainGalleryWidget(),
                 _deviceFolderGalleryWidget,
                 _remoteFolderGalleryWidget,
               ],
@@ -112,6 +103,19 @@ class _HomeWidgetState extends State<HomeWidget> {
     );
   }
 
+  Gallery _getMainGalleryWidget() {
+    return Gallery(
+      _getFilteredPhotos(PhotoRepository.instance.photos),
+      _selectedPhotos,
+      photoSelectionChangeCallback: (Set<Photo> selectedPhotos) {
+        setState(() {
+          _selectedPhotos = selectedPhotos;
+        });
+      },
+      enablePullToSync: true,
+    );
+  }
+
   BottomNavigationBar _buildBottomNavigationBar() {
     return BottomNavigationBar(
       items: const <BottomNavigationBarItem>[