diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 7ccee9042..d21733147 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +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).
+
 2007-01-22  Don Allingham  <don@gramps-project.org>
 	* src/DisplayModels/_BaseModel.py: avoid rebuild on delete
 	* src/PageView.py:  avoid rebuild on delete
diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py
index 23017657b..f8a06610f 100644
--- a/gramps2/src/ViewManager.py
+++ b/gramps2/src/ViewManager.py
@@ -783,6 +783,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)
             self.vb_handlers_unblock()
 
     def vb_handlers_block(self):