diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29d64b0..15485cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### v1.2.2
+
+* Improve scrolling on the `DragDismissActivity` by removing the `AppBarLayout` and handing its functionality myself
+
 ### v1.2.1
 
 * Don't have `Activity#onCreate` as `final`
diff --git a/README.md b/README.md
index f7ec4bd..c8cc4d2 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ To include it in your project, add this to your module's `build.gradle` file:
 ```groovy
 dependencies {
 	...
-	compile 'com.klinkerapps:drag-dismiss-activity:1.2.1'
+	compile 'com.klinkerapps:drag-dismiss-activity:1.2.2'
 }
 ```
 
diff --git a/gradle.properties b/gradle.properties
index 1eea80f..67e9299 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,7 +23,7 @@ MIN_SDK=15
 TARGET_SDK=25
 COMPILE_SDK=25
 
-VERSION_NAME=1.2.1
+VERSION_NAME=1.2.2
 VERSION_CODE=1
 GROUP=com.klinkerapps
 
diff --git a/library/src/main/java/xyz/klinker/android/drag_dismiss/view/ToolbarScrollListener.java b/library/src/main/java/xyz/klinker/android/drag_dismiss/view/ToolbarScrollListener.java
index 860a934..f328c38 100644
--- a/library/src/main/java/xyz/klinker/android/drag_dismiss/view/ToolbarScrollListener.java
+++ b/library/src/main/java/xyz/klinker/android/drag_dismiss/view/ToolbarScrollListener.java
@@ -20,6 +20,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
+import android.app.Activity;
 import android.os.Handler;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v7.widget.LinearLayoutManager;
@@ -32,6 +33,7 @@
 import android.view.animation.Interpolator;
 
 import xyz.klinker.android.drag_dismiss.R;
+import xyz.klinker.android.drag_dismiss.util.ColorUtils;
 
 /**
  * Scroll listener for interacting with the toolbar when the recyclerview scrolls. This includes
diff --git a/library/src/main/res/layout/dragdismiss_activity.xml b/library/src/main/res/layout/dragdismiss_activity.xml
index ef8e351..9682ebc 100644
--- a/library/src/main/res/layout/dragdismiss_activity.xml
+++ b/library/src/main/res/layout/dragdismiss_activity.xml
@@ -63,29 +63,22 @@
                 android:visibility="gone"
                 android:indeterminate="true"/>
 
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/dragdismiss_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:layout_marginTop="24dp"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+                android:background="@color/dragdismiss_toolbarBackground"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+                app:layout_scrollFlags="" />
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="24dp"
                 android:id="@+id/dragdismiss_status_bar"
                 android:background="@color/dragdismiss_toolbarBackground"/>
 
-            <android.support.design.widget.AppBarLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                android:background="@android:color/transparent"
-                android:layout_marginTop="24dp"
-                app:elevation="0dp">
-
-                <android.support.v7.widget.Toolbar
-                    android:id="@+id/dragdismiss_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    android:background="@color/dragdismiss_toolbarBackground"
-                    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-                    app:layout_scrollFlags="" />
-
-            </android.support.design.widget.AppBarLayout>
         </android.support.design.widget.CoordinatorLayout>
     </xyz.klinker.android.drag_dismiss.view.ElasticDragDismissFrameLayout>