diff --git a/CHANGELOG.md b/CHANGELOG.md
index e503d866a5cbcae0593ab819cde5883b2c60d8ce..d949c6956590a12a896caac6e9e17ea7641309c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.8.1 (2017-11-11)
+* Fix bug with rendering `PDFView` in Android Studio Layout Editor
+
 ## 2.8.0 (2017-10-31)
 * Add handling of invalid pages, inspired by pull request #433. Exception on page opening crashed application until now,
 currently `OnPageErrorListener` set with `.onPageError()` is called. Invalid page color can be set using `.invalidPageColor()`
diff --git a/README.md b/README.md
index 1315395d09647cf334db9fbba2ea18c7d1514b75..0ab85c821dc08baa7e47a855f1ed7cc4a573c358 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ currently `OnPageErrorListener` set with `Configurator#onPageError()` is called.
 * Implement `canScrollVertically()` and `canScrollHorizontally()` methods to work e.g. with `SwipeRefreshLayout`
 * Fix bug when `Configurator#load()` method was called before view has been measured, which resulted in empty canvas
 
+2.8.1 fixes bug with rendering `PDFView` in Android Studio Layout Editor
+
 ## Changes in 2.0 API
 * `Configurator#defaultPage(int)` and `PDFView#jumpTo(int)` now require page index (i.e. starting from 0)
 * `OnPageChangeListener#onPageChanged(int, int)` is called with page index (i.e. starting from 0)
@@ -29,7 +31,7 @@ currently `OnPageErrorListener` set with `Configurator#onPageError()` is called.
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:2.8.0'`
+`compile 'com.github.barteksc:android-pdf-viewer:2.8.1'`
 
 Library is available in jcenter repository, probably it'll be in Maven Central soon.
 
diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle
index 44b8f3587ae07cb751d8edbbaf9f615646690b1c..8ee3ed429d37a933d0260be2a42c7870fb95dfd9 100644
--- a/android-pdf-viewer/build.gradle
+++ b/android-pdf-viewer/build.gradle
@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/barteksc/AndroidPdfViewer'
     gitUrl = 'https://github.com/barteksc/AndroidPdfViewer.git'
 
-    libraryVersion = '2.8.0'
+    libraryVersion = '2.8.1'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -32,7 +32,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 25
         versionCode 1
-        versionName "2.8.0"
+        versionName "2.8.1"
     }
 
 }
diff --git a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java
index f090839f87219d379f751fc08b7eb34ddcef920c..69656498eb2277af3846d73e9a77d85f68b8fdb7 100644
--- a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java
+++ b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java
@@ -598,6 +598,9 @@ public class PDFView extends RelativeLayout {
     @Override
     public void computeScroll() {
         super.computeScroll();
+        if (isInEditMode()) {
+            return;
+        }
         animationManager.computeFling();
     }