diff --git a/src/components/panels/EditorPanel.jsx b/src/components/panels/EditorPanel.jsx
index e84b9a7..0a43de8 100644
--- a/src/components/panels/EditorPanel.jsx
+++ b/src/components/panels/EditorPanel.jsx
@@ -125,7 +125,7 @@ export class EditorPanel extends React.PureComponent {
 
         <div className={classnames('panel right', { active: !editing })}>
           <div className="control-bar">
-            <button className="success" onClick={this.startEditing}>
+            <button className="success single" onClick={this.startEditing}>
               <Icon icon="icon-router" />
               <span>
                 РЕДАКТИРОВАТЬ
diff --git a/src/modules/Editor.js b/src/modules/Editor.js
index f386c48..c4d33b1 100644
--- a/src/modules/Editor.js
+++ b/src/modules/Editor.js
@@ -209,6 +209,7 @@ export class Editor {
     const { path } = getUrlData();
     pushPath(`/${path}`);
 
+    this.changeMode(MODES.NONE);
     this.poly.poly.disableEdit();
     this.stickers.stopEditing();
     this.setEditing(false);
diff --git a/src/styles/panel.less b/src/styles/panel.less
index bdc8b79..c68ef29 100644
--- a/src/styles/panel.less
+++ b/src/styles/panel.less
@@ -1,10 +1,8 @@
 .control-bar {
   background: @bar_background;
-  border-radius: 3px;
+  border-radius: 4px;
   display: flex;
   box-shadow: @bar_shadow;
-
-
 }
 
 .control-dist {
@@ -103,6 +101,10 @@
       background-size: 100% 100%;
     }
 
+    &.single {
+      border-radius: 3px;
+    }
+
     svg {
       fill: white;
       stroke: white;