diff --git a/app/src/main/java/cc/winboll/gallery/ImageViewerActivity.java b/app/src/main/java/cc/winboll/gallery/ImageViewerActivity.java
index 6442e07..c52358f 100644
--- a/app/src/main/java/cc/winboll/gallery/ImageViewerActivity.java
+++ b/app/src/main/java/cc/winboll/gallery/ImageViewerActivity.java
@@ -4,8 +4,10 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
+import android.view.View.OnTouchListener;
 import android.view.WindowManager;
 import android.widget.ImageButton;
 import androidx.viewpager.widget.ViewPager;
@@ -22,6 +24,7 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
     private ImageButton btnBack;
     private ImageButton btnDelete;
     private ImageButton btnShare;
+    private GestureDetector gestureDetector;
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -44,33 +47,41 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
         viewPager.setCurrentItem(currentPosition);
         viewPager.addOnPageChangeListener(this);
         
-        btnBack.setOnClickListener(new OnClickListener() {
+        gestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapConfirmed(MotionEvent e) {
+                toggleToolbar();
+                return true;
+            }
+        });
+        
+        viewPager.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                return gestureDetector.onTouchEvent(event);
+            }
+        });
+        
+        btnBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
             }
         });
         
-        btnDelete.setOnClickListener(new OnClickListener() {
+        btnDelete.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 deleteCurrentImage();
             }
         });
         
-        btnShare.setOnClickListener(new OnClickListener() {
+        btnShare.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 shareCurrentImage();
             }
         });
-        
-        viewPager.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                toggleToolbar();
-            }
-        });
     }
     
     private void toggleToolbar() {
diff --git a/app/src/main/res/layout/activity_image_viewer.xml b/app/src/main/res/layout/activity_image_viewer.xml
index 7891493..3d7ef55 100644
--- a/app/src/main/res/layout/activity_image_viewer.xml
+++ b/app/src/main/res/layout/activity_image_viewer.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black">
+    android:background="@color/black"
+    android:clickable="true"
+    android:focusable="true">
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:clickable="false"/>
 
     <LinearLayout
         android:id="@+id/toolbar"