--- a/Tools__NavigationState.st	Fri Dec 06 17:11:32 2013 +0000
+++ b/Tools__NavigationState.st	Fri Dec 06 17:54:27 2013 +0000
@@ -525,52 +525,53 @@
 !
 
 setUpScrollableCodeView
-    |v aScrollableCodeView codeView |
+    |v newScrollableCodeView newCodeView |
 
     (UserPreferences current useCodeView2In: #Browser) ifTrue:[
-        codeView := aScrollableCodeView := CodeView2 new.
-        codeView mode: #method.
-        codeView methodHolder: self theSingleSelectedMethodHolder.
-        codeView classHolder: self theSingleSelectedClassHolder.
+        newCodeView := newScrollableCodeView := CodeView2 new.
+        newCodeView mode: #method.
+        newCodeView methodHolder: self theSingleSelectedMethodHolder.
+        newCodeView classHolder: self theSingleSelectedClassHolder.
     ] ifFalse:[
-        aScrollableCodeView := HVScrollableView for:CodeView.
-        codeView := aScrollableCodeView scrolledView.
-        aScrollableCodeView horizontalMini:true.
+        newScrollableCodeView := HVScrollableView for:CodeView.
+        newCodeView := newScrollableCodeView scrolledView.
+        newScrollableCodeView horizontalMini:true.
     ].
 
-    aScrollableCodeView name:'CodeView'.
-    codeView modifiedChannel:self codeModifiedHolder.
-    codeView model:self codeHolder.
-    codeView canTab:true.
+    newScrollableCodeView name:'CodeView'.
+    newCodeView modifiedChannel:self codeModifiedHolder.
+    newCodeView model:self codeHolder.
+    newCodeView canTab:true.
     UserPreferences current useCodeView2InTools ifTrue:[
-        codeView
+        newCodeView
             classHolder:self theSingleSelectedClassFromMethodHolder;
             languageHolder:self languageHolder
     ].
 
-    UserPreferences current showAcceptCancelBarInBrowser ifTrue:[
+    (UserPreferences current showAcceptCancelBarInBrowser 
+        and:[newCodeView isCodeView2 not or:[UserPreferences current codeView2ShowAcceptCancel not]]) ifTrue:[
         ViewWithAcceptAndCancelBar notNil ifTrue:[
             v := ViewWithAcceptAndCancelBar new.
-            v slaveView:aScrollableCodeView.
+            v slaveView:newScrollableCodeView.
             v reallyModifiedHolder:self realModifiedStateHolder.
             v cancelAction:
                 [
                     "/ codeView setClipboardText:(codeView contents).   "/ for undo
-                    codeView device rememberInCopyBufferHistory:(codeView contents).  "/ for undo
-                    codeView application
+                    newCodeView device rememberInCopyBufferHistory:(newCodeView contents).  "/ for undo
+                    newCodeView application
                         delayedUpdateCodeWithAutoSearch:false checkModified:false.
-                    codeView requestFocus.
+                    newCodeView requestFocus.
                 ].
             v compareAction:
                 [
-                    codeView application doCompareIn:self.
-                    codeView requestFocus
+                    newCodeView application doCompareIn:self.
+                    newCodeView requestFocus
                 ].
-            aScrollableCodeView := v.
+            newScrollableCodeView := v.
         ]
     ].
 
-   ^aScrollableCodeView
+   ^newScrollableCodeView
 
     "Modified: / 05-07-2011 / 10:34:33 / cg"
     "Modified: / 05-08-2011 / 09:44:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"