diff --git a/Signal/src/ViewControllers/MediaGalleryViewController.swift b/Signal/src/ViewControllers/MediaGalleryViewController.swift
index 694e49863..44a8ba500 100644
--- a/Signal/src/ViewControllers/MediaGalleryViewController.swift
+++ b/Signal/src/ViewControllers/MediaGalleryViewController.swift
@@ -197,8 +197,7 @@ class MediaGalleryViewController: OWSNavigationController, MediaGalleryDataSourc
 
         self.options = options
         self.mediaGalleryFinder = OWSMediaGalleryFinder(thread: thread)
-
-        super.init(nibName: nil, bundle: nil)
+        super.init(owsNavigationBar: ())
     }
 
     required init?(coder aDecoder: NSCoder) {
diff --git a/SignalMessaging/ViewControllers/OWSNavigationController.h b/SignalMessaging/ViewControllers/OWSNavigationController.h
index 533a5b4d0..5da136eca 100644
--- a/SignalMessaging/ViewControllers/OWSNavigationController.h
+++ b/SignalMessaging/ViewControllers/OWSNavigationController.h
@@ -23,6 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
 // unsaved changes.
 @interface OWSNavigationController : UINavigationController
 
+- (instancetype)initWithOWSNavigationBar;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/SignalMessaging/ViewControllers/OWSNavigationController.m b/SignalMessaging/ViewControllers/OWSNavigationController.m
index 875b0deaa..ba3a34201 100644
--- a/SignalMessaging/ViewControllers/OWSNavigationController.m
+++ b/SignalMessaging/ViewControllers/OWSNavigationController.m
@@ -24,15 +24,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation OWSNavigationController
 
-- (instancetype)initWithRootViewController:(UIViewController *)rootViewController
+- (instancetype)initWithOWSNavigationBar
 {
     self = [self initWithNavigationBarClass:[OWSNavigationBar class] toolbarClass:nil];
     if (!self) {
         return self;
     }
 
-    [self pushViewController:rootViewController animated:NO];
-
     if (![self.navigationBar isKindOfClass:[OWSNavigationBar class]]) {
         OWSFailDebug(@"navigationBar was unexpected class: %@", self.navigationBar);
         return self;
@@ -50,6 +48,17 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
+- (instancetype)initWithRootViewController:(UIViewController *)rootViewController
+{
+    self = [self initWithOWSNavigationBar];
+    if (!self) {
+        return self;
+    }
+    [self pushViewController:rootViewController animated:NO];
+
+    return self;
+}
+
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];