diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 89737456..0773db07 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -18,7 +18,7 @@
                         <el-button ref="fullScreen" class="tool-button" :class="buttonActiveClass('fullScreen')" @click="buttonClick('fullScreen')"><i class="el-icon-rank"></i></el-button>
                     </el-tooltip>
                     <el-tooltip content="Прокрутка книги" :open-delay="1000" effect="light">
-                        <el-button ref="setPosition" class="tool-button" @click="buttonClick('setPosition')"><i class="el-icon-d-arrow-right"></i></el-button>
+                        <el-button ref="setPosition" class="tool-button" :class="buttonActiveClass('setPosition')" @click="buttonClick('setPosition')"><i class="el-icon-d-arrow-right"></i></el-button>
                     </el-tooltip>
                     <el-tooltip content="Плавный скроллинг" :open-delay="1000" effect="light">
                         <el-button ref="scrolling" class="tool-button" @click="buttonClick('scrolling')"><i class="el-icon-sort"></i></el-button>
@@ -434,10 +434,10 @@ class Reader extends Vue {
     keyHook(event) {
         if (this.$root.rootRoute == '/reader') {
             let handled = false;
-            if (this.historyActive)
+            if (!handled && this.historyActive)
                 handled = this.$refs.historyPage.keyHook(event);
 
-            if (this.setPositionActive)
+            if (!handled && this.setPositionActive)
                 handled = this.$refs.setPositionPage.keyHook(event);
 
             if (!handled && this.$refs.page && this.$refs.page.keyHook)
diff --git a/client/components/Reader/SetPositionPage/SetPositionPage.vue b/client/components/Reader/SetPositionPage/SetPositionPage.vue
index 1a7bb973..85f8263a 100644
--- a/client/components/Reader/SetPositionPage/SetPositionPage.vue
+++ b/client/components/Reader/SetPositionPage/SetPositionPage.vue
@@ -1,6 +1,6 @@
 <template>
     <div ref="main" class="main" @click="close">
-        <div class="clickStop" @click.stop>
+        <div class="mainWindow" @click.stop>
             <Window @close="close">
                 <template slot="header">
                     Установить позицию
@@ -78,11 +78,13 @@ class SetPositionPage extends Vue {
     align-items: center;
 }
 
-.clickStop {
+.mainWindow {
     width: 100%;
     max-width: 600px;
     height: 140px;
     display: flex;
+    position: relative;
+    top: -50px;
 }
 
 .slider {
diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index d2cd37fc..52d16ea2 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -360,6 +360,9 @@ class TextPage extends Vue {
         this.pagePrepared = false;
         this.debouncedPrepareNextPage();
         this.debouncedDrawStatusBar();
+
+        if (this.book && this.linesDown && this.linesDown.length < this.pageLineCount)
+            this.doEnd();
     }
 
     drawPage(bookPos, nextChangeLines) {