diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java
index 68fabbcc9434..97fa5109c56f 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java
@@ -71,15 +71,13 @@ public class PagedListWithActions<T> {
       final List<T> data = myEngine.next();
       myComponentManager.setData(data);
       myComponentManager.refresh();
-      /*myList.setListData(ArrayUtil.toObjectArray(data));
-      myList.revalidate();
-      myList.repaint();*/
     }
 
     @Override
     public void update(AnActionEvent e) {
       super.update(e);
       e.getPresentation().setEnabled(myEngine.hasNext());
+      e.getPresentation().setVisible(myEngine.hasNext());
     }
   }
 
@@ -99,6 +97,7 @@ public class PagedListWithActions<T> {
     public void update(AnActionEvent e) {
       super.update(e);
       e.getPresentation().setEnabled(myEngine.hasPrevious());
+      e.getPresentation().setVisible(myEngine.hasPrevious());
     }
   }
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java
index 2d31097aa7c8..052c4686631a 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java
@@ -15,9 +15,9 @@
  */
 package org.jetbrains.idea.svn.dialogs;
 
-import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonShortcuts;
+import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Splitter;
@@ -75,7 +75,9 @@ public class ToBeMergedDialog extends DialogWrapper {
     setTitle(title);
     myProject = project;
 
-    myListsEngine = new BasePageEngine<CommittedChangeList>(lists, ourPageSize);
+    // todo removing pages for a while
+    //myListsEngine = new BasePageEngine<CommittedChangeList>(lists, ourPageSize);
+    myListsEngine = new BasePageEngine<CommittedChangeList>(lists, lists.size());
 
     myPanel = new JPanel(new BorderLayout());
     myWiseSelection = new QuantitySelection<Long>(true);
@@ -299,7 +301,7 @@ public class ToBeMergedDialog extends DialogWrapper {
     return myPanel;
   }
 
-  private class MySelectAll extends AnAction {
+  private class MySelectAll extends DumbAwareAction {
     private MySelectAll() {
       super("Select All", "Select All", IconLoader.getIcon("/actions/selectall.png"));
     }
@@ -311,7 +313,7 @@ public class ToBeMergedDialog extends DialogWrapper {
     }
   }
 
-  private class MyUnselectAll extends AnAction {
+  private class MyUnselectAll extends DumbAwareAction {
     private MyUnselectAll() {
       super("Unselect All", "Unselect All", IconLoader.getIcon("/actions/unselectall.png"));
     }