diff --git a/src/views/Drawer/DrawerView.js b/src/views/Drawer/DrawerView.js
index 32a73c5..8062fab 100644
--- a/src/views/Drawer/DrawerView.js
+++ b/src/views/Drawer/DrawerView.js
@@ -93,10 +93,10 @@ export default class DrawerView extends React.PureComponent<
       if (routes[index].routeName === drawerOpenRoute) {
         this._drawer.openDrawer();
       } else if (routes[index].routeName === drawerToggleRoute) {
-        if (this._drawer.state.drawerShown) {
-          this.props.navigation.navigate(drawerCloseRoute);
-        } else {
+        if (this.props.navigation.state.index === 0) {
           this.props.navigation.navigate(drawerOpenRoute);
+        } else {
+          this.props.navigation.navigate(drawerCloseRoute);
         }
       } else {
         this._drawer.closeDrawer();