diff --git a/src/Git/Repository.cs b/src/Git/Repository.cs
index c11f3169..e3609b5c 100644
--- a/src/Git/Repository.cs
+++ b/src/Git/Repository.cs
@@ -54,10 +54,6 @@ namespace SourceGit.Git {
         ///     Last 10 Commit message.
         /// </summary>
         public List<string> CommitMsgRecords { get; set; } = new List<string>();
-        /// <summary>
-        ///     Commit template.
-        /// </summary>
-        public string CommitTemplate { get; set; }
         #endregion
 
         #region PROPERTIES_RUNTIME
diff --git a/src/UI/Configure.xaml b/src/UI/Configure.xaml
index 368874ee..d64572c8 100644
--- a/src/UI/Configure.xaml
+++ b/src/UI/Configure.xaml
@@ -6,7 +6,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:helpers="clr-namespace:SourceGit.Helpers"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="500" Width="500" Height="314">
+             d:DesignHeight="150" d:DesignWidth="500" Width="500" Height="150">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="36"/>
@@ -14,10 +14,6 @@
             <RowDefinition Height="28"/>
             <RowDefinition Height="28"/>
             <RowDefinition Height="18"/>
-            <RowDefinition Height="36"/>
-            <RowDefinition Height="8"/>
-            <RowDefinition Height="102"/>
-            <RowDefinition Height="18"/>
             <RowDefinition Height="32"/>
         </Grid.RowDefinitions>
 
@@ -43,20 +39,8 @@
             Text="{Binding ElementName=me, Path=UserEmail, Mode=TwoWay}"
             helpers:TextBoxHelper.Placeholder="{StaticResource Text.Configure.Email.Placeholder}"/>
         
-        <!-- 提交模板 -->
-        <Label Grid.Row="5" Grid.ColumnSpan="2" Content="{StaticResource Text.Configure.CommitTemplate}" FontSize="16" FontWeight="DemiBold" Opacity=".85"/>
-        <Label Grid.Row="7" Grid.Column="0" Content="{StaticResource Text.Configure.Template}" HorizontalAlignment="Right" VerticalAlignment="Top"/>
-        <TextBox
-            Grid.Row="7"
-            Grid.Column="1"
-            Height="100"
-            AcceptsReturn="True"
-            AcceptsTab="True"
-            Padding="2"
-            Text="{Binding ElementName=me, Path=CommitTemplate, Mode=TwoWay}"/>
-        
         <!-- 操作 -->
-        <Grid Grid.Row="9" Grid.ColumnSpan="2">
+        <Grid Grid.Row="5" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="80"/>
diff --git a/src/UI/Configure.xaml.cs b/src/UI/Configure.xaml.cs
index 7f810071..226eec6c 100644
--- a/src/UI/Configure.xaml.cs
+++ b/src/UI/Configure.xaml.cs
@@ -33,7 +33,6 @@ namespace SourceGit.UI {
 
             UserName = repo.GetConfig("user.name");
             UserEmail = repo.GetConfig("user.email");
-            CommitTemplate = repo.CommitTemplate;
 
             InitializeComponent();
         }
@@ -54,11 +53,6 @@ namespace SourceGit.UI {
             var oldEmail = repo.GetConfig("user.email");
             if (oldEmail != UserEmail) repo.SetConfig("user.email", UserEmail);
 
-            if (CommitTemplate != repo.CommitTemplate) {
-                repo.CommitTemplate = CommitTemplate;
-                App.SaveSetting();
-            }
-
             Close(sender, e);
         }
 
diff --git a/src/UI/WorkingCopy.xaml b/src/UI/WorkingCopy.xaml
index 5dc47449..d864c26b 100644
--- a/src/UI/WorkingCopy.xaml
+++ b/src/UI/WorkingCopy.xaml
@@ -392,7 +392,6 @@
                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                 helpers:TextBoxHelper.Placeholder="{StaticResource Text.WorkingCopy.CommitMessageTip}"
                 helpers:TextBoxHelper.PlaceholderBaseline="Top"
-                GotFocus="CommitMsgGotFocus"
                 PreviewMouseWheel="CommitMsgPreviewMouseWheel">
                 <TextBox.Text>
                     <Binding ElementName="me" Path="CommitMessage" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
diff --git a/src/UI/WorkingCopy.xaml.cs b/src/UI/WorkingCopy.xaml.cs
index 42407185..17c8befa 100644
--- a/src/UI/WorkingCopy.xaml.cs
+++ b/src/UI/WorkingCopy.xaml.cs
@@ -839,15 +839,6 @@ namespace SourceGit.UI {
         #endregion
 
         #region COMMIT_PANEL
-        private void CommitMsgGotFocus(object sender, RoutedEventArgs e) {
-            var textBox = sender as TextBox;
-            if (textBox == null) return;
-
-            if (string.IsNullOrEmpty(textBox.Text) && !string.IsNullOrEmpty(Repo.CommitTemplate)) {
-                textBox.Text = Repo.CommitTemplate;
-            }
-        }
-
         private void CommitMsgPreviewMouseWheel(object sender, MouseWheelEventArgs e) {
             var textBox = sender as TextBox;
             if (textBox == null) return;