diff --git a/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m
index 75ef50f4b..37d125792 100644
--- a/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m
+++ b/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m
@@ -9,7 +9,10 @@ Please see LICENSE in the repository root for full details.
 #import "MXKPreviewViewController.h"
 @import QuickLook;
 
-@interface MXKPreviewViewController () <QLPreviewControllerDataSource>
+@interface MXKPreviewViewController () <QLPreviewControllerDataSource> {
+    // BWI #8137 remove share button
+    NSTimer *removeShareButtonTimer;
+}
 
 /// A specialized view controller for previewing an item.
 @property (nonatomic, weak) QLPreviewController *previewController;
@@ -63,22 +66,20 @@ Please see LICENSE in the repository root for full details.
     
     if (!self.allowActions)
     {
-        NSMutableArray *items = [NSMutableArray arrayWithArray: self.previewController.navigationItem.rightBarButtonItems];
-        if (items.count > 0)
-        {
-            [items removeObjectAtIndex:0];
-        }
-        self.previewController.navigationItem.rightBarButtonItems = items;
-        // bwi: no toolbar items to disallow share files
-        self.previewController.toolbarItems = nil;
-        // bwi: no title to disallow sharing/printing
-        self.previewController.navigationItem.title = @"";
+        // BWI #8137 remove share button
+        [removeShareButtonTimer invalidate];
+        removeShareButtonTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 repeats:YES block:^(NSTimer * _Nonnull timer) {
+            [self removeShareButtons];
+        }];
     }
 }
 
 
 - (IBAction)doneAction:(id)sender
 {
+    // BWI #8137 remove share button
+    [removeShareButtonTimer invalidate];
+    removeShareButtonTimer = nil;
     [self dismissViewControllerAnimated:YES completion:^{
         if ([self.previewDelegate respondsToSelector:@selector(previewViewControllerDidEndPreview:)]) {
             [self.previewDelegate previewViewControllerDidEndPreview:self];
@@ -86,6 +87,21 @@ Please see LICENSE in the repository root for full details.
     }];
 }
 
+// BWI #8137 remove share button
+- (void)removeShareButtons
+{
+    NSMutableArray *items = [NSMutableArray arrayWithArray: self.previewController.navigationItem.rightBarButtonItems];
+    if (items.count > 0)
+    {
+        [items removeObjectAtIndex:0];
+    }
+    self.previewController.navigationItem.rightBarButtonItems = items;
+    // bwi: no toolbar items to disallow share files
+    self.previewController.toolbarItems = nil;
+    // bwi: no title to disallow sharing/printing
+    self.previewController.navigationItem.title = @"";
+}
+
 #pragma mark - QLPreviewControllerDataSource
 
 - (NSInteger)numberOfPreviewItemsInPreviewController:(nonnull QLPreviewController *)controller