diff --git a/lib/ui/app/history_drawer.dart b/lib/ui/app/history_drawer.dart
index 85bb4683b..533b32270 100644
--- a/lib/ui/app/history_drawer.dart
+++ b/lib/ui/app/history_drawer.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
+import 'package:invoiceninja_flutter/redux/ui/ui_state.dart';
 import 'package:timeago/timeago.dart' as timeago;
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
@@ -67,6 +68,13 @@ class HistoryDrawer extends StatelessWidget {
                   },
                 ),
               )
+            else
+              FlatButton(
+                child: Text(localization.close),
+                onPressed: () {
+                  store.dispatch(UpdateSidebar(AppSidebar.history));
+                },
+              )
           ],
         ),
         body: ListView(
diff --git a/lib/ui/app/list_scaffold.dart b/lib/ui/app/list_scaffold.dart
index ecb07dd56..d3ddafaee 100644
--- a/lib/ui/app/list_scaffold.dart
+++ b/lib/ui/app/list_scaffold.dart
@@ -90,7 +90,9 @@ class ListScaffold extends StatelessWidget {
             title: appBarTitle,
             actions: [
               ...appBarActions,
-              if (!showCheckbox && !isSettings)
+              if (!showCheckbox &&
+                  !isSettings &&
+                  !state.uiState.isHistoryVisible)
                 Builder(
                   builder: (context) => IconButton(
                     icon: Icon(Icons.menu),