diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java
index d99f279..f47118a 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java
@@ -65,7 +65,8 @@
     public void incrementPageNo(MutableLiveData<Integer> mPageNo, Integer pageSize) {
         Integer editingNo = acanthus.getEditingPageNo();
 
-        if (editingNo < pageSize) {
+        if (editingNo <= pageSize) {
+            if(999 < pageSize) return;
             acanthus.setEditingPageNo(editingNo + 1);
             mPageNo.setValue(acanthus.getEditingPageNo());
         }
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java
index 1cac73a..f3cab2c 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java
@@ -74,7 +74,12 @@
     //-----------------------------------------------------------------
     // ページを次に進める
     public void onClickToAdvancePage(View view) {
+        // ページサイズと同じ状況なら新しくページを追加する
+        if(pageViewModel.getPageSize().getValue() == pageViewModel.getCurPageNo().getValue())
+            pageViewModel.addPageRequest();
+
         pageViewModel.toAdvanceEditingPage();
+
     }
 
     //-----------------------------------------------------------------
@@ -89,23 +94,23 @@
         pageViewModel.switchToEditPageRequest(event);
     }
 
-//    //-----------------------------------------------------------------
-//    //
-//    @Override
-//    public boolean onTouchEvent(MotionEvent event) {
-//        int action = event.getActionMasked();
-//
-//        //-----------------------------------------------------------------
-//        switch (action) {
-//
-//            case MotionEvent.ACTION_MOVE:
-//                slidePage(event);
-//
-//                break;
-//        }
-//
-//        return true;
-//    }
+    //-----------------------------------------------------------------
+    //
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        int action = event.getActionMasked();
+
+        //-----------------------------------------------------------------
+        switch (action) {
+
+            case MotionEvent.ACTION_MOVE:
+                slidePage(event);
+
+                break;
+        }
+
+        return true;
+    }
 
     //-----------------------------------------------------------------
     //-----------------------------------------------------------------