diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50d67f6e0..3b2c46b7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,10 @@ All notable changes to this project will be documented in this file.
 
 - upgraded Flutter to stable v3.3.0
 
+### Fixed
+
+- fixed opening viewer with directory context in some cases
+
 ## <a id="v1.6.13"></a>[v1.6.13] - 2022-08-29
 
 ### Changed
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
index b171334fd..442d35190 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
@@ -56,7 +56,7 @@ class MediaStoreImageProvider : ImageProvider() {
             val relativePath = PathSegments(context, relativePathDirectory).relativeDir
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && relativePath != null) {
                 selection = "${MediaStore.MediaColumns.RELATIVE_PATH} = ? AND ${MediaColumns.PATH} LIKE ?"
-                selectionArgs = arrayOf(relativePath, "relativePathDirectory%")
+                selectionArgs = arrayOf(relativePath, "$relativePathDirectory%")
             } else {
                 selection = "${MediaColumns.PATH} LIKE ?"
                 selectionArgs = arrayOf("$relativePathDirectory%")
diff --git a/lib/widgets/common/app_bar/app_bar_subtitle.dart b/lib/widgets/common/app_bar/app_bar_subtitle.dart
index 688ca0ab5..bc33ac08f 100644
--- a/lib/widgets/common/app_bar/app_bar_subtitle.dart
+++ b/lib/widgets/common/app_bar/app_bar_subtitle.dart
@@ -38,7 +38,7 @@ class SourceStateAwareAppBarTitle extends StatelessWidget {
                 ),
               ),
               child: sourceState == SourceState.ready
-                  ? const SizedBox.shrink()
+                  ? const SizedBox()
                   : SourceStateSubtitle(
                       source: source,
                     ),
diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart
index e26607508..9ebbe0b03 100644
--- a/lib/widgets/home_page.dart
+++ b/lib/widgets/home_page.dart
@@ -22,8 +22,8 @@ import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/search/route.dart';
 import 'package:aves/widgets/filter_grids/albums_page.dart';
 import 'package:aves/widgets/search/search_delegate.dart';
-import 'package:aves/widgets/settings/screen_saver_settings_page.dart';
 import 'package:aves/widgets/settings/home_widget_settings_page.dart';
+import 'package:aves/widgets/settings/screen_saver_settings_page.dart';
 import 'package:aves/widgets/viewer/entry_viewer_page.dart';
 import 'package:aves/widgets/viewer/screen_saver_page.dart';
 import 'package:aves/widgets/wallpaper_page.dart';
@@ -206,6 +206,7 @@ class _HomePageState extends State<HomePage> {
             final source = context.read<CollectionSource>();
             await source.init(
               directory: directory,
+              canAnalyze: false,
             );
           }
         }