diff --git a/lib/ui/detail_page.dart b/lib/ui/detail_page.dart
index 013343113..be6af84f4 100644
--- a/lib/ui/detail_page.dart
+++ b/lib/ui/detail_page.dart
@@ -22,6 +22,8 @@ class _DetailPageState extends State<DetailPage> {
 
   @override
   Widget build(BuildContext context) {
+    var pageController = PageController(initialPage: widget.selectedIndex);
+
     return Scaffold(
       appBar: AppBar(
         actions: <Widget>[
@@ -47,6 +49,7 @@ class _DetailPageState extends State<DetailPage> {
             physics: _shouldDisableScroll
                 ? NeverScrollableScrollPhysics()
                 : PageScrollPhysics(),
+            controller: pageController,
           ),
         ),
       ),
diff --git a/lib/ui/gallery.dart b/lib/ui/gallery.dart
index 5c2f7a5c4..1a4f35c50 100644
--- a/lib/ui/gallery.dart
+++ b/lib/ui/gallery.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:logger/logger.dart';
 import 'package:myapp/db/db_helper.dart';
 import 'package:myapp/models/photo.dart';
 import 'package:path/path.dart' as path;
@@ -14,11 +15,9 @@ import 'package:share_extend/share_extend.dart';
 import 'detail_page.dart';
 
 class Gallery extends StatefulWidget {
-  final List<Photo> photos = List<Photo>();
+  final List<Photo> photos;
 
-  Gallery(List<Photo> photoList) {
-    this.photos.addAll(photoList);
-  }
+  Gallery(this.photos);
 
   @override
   _GalleryState createState() {
@@ -165,6 +164,7 @@ class _GalleryState extends State<Gallery> {
   }
 
   void routeToDetailPage(Photo photo, BuildContext context) {
+    Logger().i("Photo index: " + widget.photos.indexOf(photo).toString());
     final page = DetailPage(widget.photos, widget.photos.indexOf(photo));
     Navigator.of(context).push(
       MaterialPageRoute(