diff --git a/plugins/c9.ide.dialog.common/confirm.js b/plugins/c9.ide.dialog.common/confirm.js
index 58e11379..68915519 100644
--- a/plugins/c9.ide.dialog.common/confirm.js
+++ b/plugins/c9.ide.dialog.common/confirm.js
@@ -14,8 +14,8 @@ define(function(require, module, exports) {
             allowClose: false,
             modal: true,
             elements: [
-                { type: "button", id: "cancel", caption: "Cancel", hotkey: "ESC", onclick: function(){ plugin.hide() } },
-                { type: "button", id: "ok", caption: "OK", color: "green", "default": true, onclick: function(){ plugin.hide() } }
+                { type: "button", id: "ok", caption: "OK", color: "green", "default": true, onclick: function(){ plugin.hide() } },
+                { type: "button", id: "cancel", caption: "Cancel", hotkey: "ESC", onclick: function(){ plugin.hide() } }
             ]
         });
         
diff --git a/plugins/c9.ide.dialog.file/file.xml b/plugins/c9.ide.dialog.file/file.xml
index dd4b341e..e768d829 100644
--- a/plugins/c9.ide.dialog.file/file.xml
+++ b/plugins/c9.ide.dialog.file/file.xml
@@ -67,13 +67,6 @@
                     Show files in tree
                 </a:checkbox>
                 <a:filler />
-                <a:button
-                  id       = "btnCancel"
-                  class    = "btn-red"
-                  skin     = "btn-default-css3"
-                  width   = "120"
-                  caption  = "Cancel"
-                />
                 <a:button
                   id      = "btnChoose"
                   class   = "btn-green"
@@ -81,6 +74,13 @@
                   caption = "Save"
                   skin    = "btn-default-css3"
                 />
+                <a:button
+                  id       = "btnCancel"
+                  class    = "btn-red"
+                  skin     = "btn-default-css3"
+                  width   = "120"
+                  caption  = "Cancel"
+                />
             </a:hbox>
         </a:vbox>
     </a:window>
diff --git a/plugins/c9.ide.dialog.login/login.xml b/plugins/c9.ide.dialog.login/login.xml
index aff22bd0..f864a2d1 100644
--- a/plugins/c9.ide.dialog.login/login.xml
+++ b/plugins/c9.ide.dialog.login/login.xml
@@ -47,17 +47,17 @@
             </div>
             
             <a:hbox edge="23 0 10" pack="end" padding="8">
-                <a:button
-                  id       = "btnCancel"
-                  skin     = "btn-default-css3"
-                  caption  = "Cancel"
-                />
                 <a:button
                   id      = "btnChoose"
                   class   = "btn-green"
                   caption = "OK"
                   skin    = "btn-default-css3"
                 />
+                <a:button
+                  id       = "btnCancel"
+                  skin     = "btn-default-css3"
+                  caption  = "Cancel"
+                />
             </a:hbox>
         </a:vbox>
     </a:window>