diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index d21733147..2c34f3ead 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,6 +1,7 @@
 2007-01-22  Alex Roitman  <shura@gramps-project.org>
-	* src/ViewManager.py (vb_clicked): Add the code that used to
-	enforce the current view button (commented out).
+	* src/ViewManager.py (vb_clicked): Put back the code that used to
+	enforce the current view button;
+	(switch_page_on_dnd): block and unblock button clicking during DnD.
 
 2007-01-22  Don Allingham  <don@gramps-project.org>
 	* src/DisplayModels/_BaseModel.py: avoid rebuild on delete
diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py
index f8a06610f..248e37097 100644
--- a/gramps2/src/ViewManager.py
+++ b/gramps2/src/ViewManager.py
@@ -698,8 +698,10 @@ class ViewManager:
         self.views.append(view)
 
     def switch_page_on_dnd(self, widget, context, x, y, time, page_no):
+        self.vb_handlers_block()
         if self.notebook.get_current_page() != page_no:
             self.notebook.set_current_page(page_no)
+        self.vb_handlers_unblock()
     
     def create_pages(self):
         self.pages = []
@@ -783,13 +785,13 @@ class ViewManager:
         if Config.get(Config.VIEW):
             self.vb_handlers_block()
             self.notebook.set_current_page(index)
-##             # FIXME: This used to work, but now DnD switches views
-##             # and messes this up
-## 
-##             # If the click is on the same view we're in, 	 
-##             # restore the button state to active 	 
-##             if not button.get_active(): 	 
-##                 button.set_active(True)
+            # FIXME: This used to work, but now DnD switches views
+            # and messes this up
+
+            # If the click is on the same view we're in, 	 
+            # restore the button state to active 	 
+            if not button.get_active(): 	 
+                button.set_active(True)
             self.vb_handlers_unblock()
 
     def vb_handlers_block(self):