diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties
index 1935443d9ea0..5173c3c4f9ea 100644
--- a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties
+++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties
@@ -453,9 +453,9 @@ update.options.no.commit=No &Commit
 update.options.save.before.update=Clean working tree before update
 update.options.save.keep.tooltip=Leave changes on working tree
 update.options.save.keep=Do &Not Clean
-update.options.save.shelve.tooltip=Use IDEA Shelve (the files will be restored when update finishes)
+update.options.save.shelve.tooltip=Use {0}''s Shelve to save changes (the files will be restored after update)
 update.options.save.shelve=Using She&lve
-update.options.save.stash.tooltip=Use 'git stash' to save changes (the files will be restored when update finishes)
+update.options.save.stash.tooltip=Use Git Stash to save changes (the files will be restored after update)
 update.options.save.stash=Using S&tash
 update.options.type.default.tooltip=Use branch default update strategy for all updated Git VCS roots
 update.options.type.default=Branch &Default
diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form
index db27637ca0c1..bf767f9084c2 100644
--- a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form
@@ -70,13 +70,12 @@
               <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="update.options.save.stash.tooltip"/>
             </properties>
           </component>
-          <component id="d7fb3" class="javax.swing.JRadioButton" binding="myShelveRadioButton" default-binding="true">
+          <component id="d7fb3" class="javax.swing.JRadioButton" binding="myShelveRadioButton" custom-create="true" default-binding="true">
             <constraints>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="git4idea/i18n/GitBundle" key="update.options.save.shelve"/>
-              <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="update.options.save.shelve.tooltip"/>
+              <selected value="false"/>
             </properties>
           </component>
         </children>
diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java
index 91d2e58744b3..ec03decba3e0 100644
--- a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java
@@ -15,8 +15,10 @@
  */
 package git4idea.update;
 
+import com.intellij.openapi.application.ApplicationNamesInfo;
 import git4idea.config.GitVcsSettings;
 import git4idea.config.UpdateMethod;
+import git4idea.i18n.GitBundle;
 
 import javax.swing.*;
 
@@ -93,4 +95,9 @@ public class GitUpdateOptionsPanel {
     UpdatePolicyUtils.updatePolicyItem(settings.updateChangesPolicy(), myStashRadioButton, myShelveRadioButton);
   }
 
+  private void createUIComponents() {
+    myShelveRadioButton = new JRadioButton(GitBundle.message("update.options.save.shelve"));
+    myShelveRadioButton.setToolTipText(GitBundle.message("update.options.save.shelve.tooltip",
+                                                         ApplicationNamesInfo.getInstance().getFullProductName()));
+  }
 }