diff --git a/Riot/Modules/Room/Files/RoomFilesViewController.h b/Riot/Modules/Room/Files/RoomFilesViewController.h
index ed23b25f6..3173c2d0a 100644
--- a/Riot/Modules/Room/Files/RoomFilesViewController.h
+++ b/Riot/Modules/Room/Files/RoomFilesViewController.h
@@ -21,4 +21,6 @@ limitations under the License.
  */
 @interface RoomFilesViewController : MXKRoomViewController
 
+@property (nonatomic) BOOL showCancelBarButtonItem;
+
 @end
diff --git a/Riot/Modules/Room/Files/RoomFilesViewController.m b/Riot/Modules/Room/Files/RoomFilesViewController.m
index 9b1b63656..5712ecffe 100644
--- a/Riot/Modules/Room/Files/RoomFilesViewController.m
+++ b/Riot/Modules/Room/Files/RoomFilesViewController.m
@@ -159,8 +159,21 @@
 {
     // Check whether the view controller is currently displayed inside a segmented view controller or not.
     UIViewController* topViewController = ((self.parentViewController) ? self.parentViewController : self);
-    topViewController.navigationItem.rightBarButtonItem = nil;
-    topViewController.navigationItem.leftBarButtonItem = nil;
+    topViewController.navigationItem.rightBarButtonItem = nil; 
+    
+    if (self.showCancelBarButtonItem)
+    {
+        topViewController.navigationItem.leftBarButtonItem  = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(onCancel:)];
+    }
+    else
+    {
+        topViewController.navigationItem.leftBarButtonItem = nil;
+    }
+}
+
+- (void)onCancel:(id)sender
+{
+    [self withdrawViewControllerAnimated:YES completion:nil];
 }
 
 #pragma mark - MXKDataSourceDelegate