diff --git a/ResxTranslationTool/Models/Translation.cs b/ResxTranslationTool/Models/Translation.cs
index 71ea843..1777bd8 100644
--- a/ResxTranslationTool/Models/Translation.cs
+++ b/ResxTranslationTool/Models/Translation.cs
@@ -1,14 +1,21 @@
-namespace ResxTranslationTool.Models
+using Microsoft.Practices.Prism.Mvvm;
+
+namespace ResxTranslationTool.Models
 {
-    public sealed class Translation
+    public sealed class Translation : BindableBase
     {
+        private string _translatedText;
         public string Id { get; set; }
 
         public string FileName { get; set; }
 
         public string OriginalText { get; set; }
 
-        public string TranslatedText { get; set; }
+        public string TranslatedText
+        {
+            get { return _translatedText; }
+            set { SetProperty(ref _translatedText, value); }
+        }
 
         public string Comment { get; set; }
     }
diff --git a/ResxTranslationTool/Views/MainWindow.xaml b/ResxTranslationTool/Views/MainWindow.xaml
index 15cd9cc..cd3a840 100644
--- a/ResxTranslationTool/Views/MainWindow.xaml
+++ b/ResxTranslationTool/Views/MainWindow.xaml
@@ -16,6 +16,7 @@
     <Style TargetType="{x:Type TextBox}">
       <Style.Setters>
         <Setter Property="Height" Value="24" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
       </Style.Setters>
     </Style>
     <Style TargetType="{x:Type Button}">
@@ -55,8 +56,7 @@
           </TextBlock>
           <TextBox Grid.Row="0"
                    Grid.Column="2"
-                   VerticalContentAlignment="Center"
-                   Background="LightGray"
+                   Background="Gainsboro"
                    IsReadOnly="True"
                    Text="{Binding TranslationFileName}" />
 
@@ -99,8 +99,7 @@
           </TextBlock>
           <TextBox Grid.Row="0"
                    Grid.Column="2"
-                   VerticalContentAlignment="Center"
-                   Background="LightGray"
+                   Background="Gainsboro"
                    IsReadOnly="True"
                    Text="{Binding SolutionFileName}" />
 
@@ -155,8 +154,7 @@
           <TextBox Grid.Row="0"
                    Grid.Column="2"
                    Grid.ColumnSpan="5"
-                   VerticalContentAlignment="Center"
-                   Background="LightGray"
+                   Background="Gainsboro"
                    IsReadOnly="True"
                    Text="{Binding SolutionFileName}" />
 
@@ -176,7 +174,6 @@
           </TextBlock>
           <TextBox Grid.Row="2"
                    Grid.Column="2"
-                   VerticalContentAlignment="Center"
                    Text="{Binding ResourceFileMask}" />
 
           <TextBlock Grid.Row="2"
@@ -186,7 +183,6 @@
           </TextBlock>
           <TextBox Grid.Row="2"
                    Grid.Column="6"
-                   VerticalContentAlignment="Center"
                    Text="{Binding Tag}" />
 
           <!--  Scan  -->
@@ -208,8 +204,7 @@
           <TextBox Grid.Row="6"
                    Grid.Column="2"
                    Grid.ColumnSpan="5"
-                   VerticalContentAlignment="Center"
-                   Background="LightGray"
+                   Background="Gainsboro"
                    IsReadOnly="True"
                    Text="{Binding TranslationFileName}" />
 
@@ -248,8 +243,7 @@
           </TextBlock>
           <TextBox Grid.Row="0"
                    Grid.Column="2"
-                   VerticalContentAlignment="Center"
-                   Background="LightGray"
+                   Background="Gainsboro"
                    IsReadOnly="True"
                    Text="{Binding SolutionFileName}" />
 
@@ -269,8 +263,7 @@
           </TextBlock>
           <TextBox Grid.Row="2"
                    Grid.Column="2"
-                   VerticalContentAlignment="Center"
-                   Background="LightGray"
+                   Background="Gainsboro"
                    IsReadOnly="True"
                    Text="{Binding TranslationFileName}" />
 
@@ -300,16 +293,26 @@
     <DataGrid Grid.Row="2"
               AlternatingRowBackground="GhostWhite"
               AutoGenerateColumns="False"
+              CanUserAddRows="False"
               HeadersVisibility="Column"
               HorizontalGridLinesBrush="Gainsboro"
               ItemsSource="{Binding Translations}"
               VerticalGridLinesBrush="Gainsboro">
+      <DataGrid.RowStyle>
+        <Style TargetType="DataGridRow">
+          <EventSetter Event="MouseDoubleClick" Handler="TranslationRow_DoubleClick" />
+        </Style>
+      </DataGrid.RowStyle>
       <DataGrid.CellStyle>
         <Style TargetType="DataGridCell">
           <Style.Triggers>
             <Trigger Property="IsSelected" Value="True">
               <Setter Property="BorderThickness" Value="0" />
             </Trigger>
+            <Trigger Property="IsReadOnly" Value="True">
+              <Setter Property="Background" Value="Gainsboro" />
+              <Setter Property="Foreground" Value="Black" />
+            </Trigger>
           </Style.Triggers>
         </Style>
       </DataGrid.CellStyle>
diff --git a/ResxTranslationTool/Views/MainWindow.xaml.cs b/ResxTranslationTool/Views/MainWindow.xaml.cs
index 1f6f660..4c982cd 100644
--- a/ResxTranslationTool/Views/MainWindow.xaml.cs
+++ b/ResxTranslationTool/Views/MainWindow.xaml.cs
@@ -1,5 +1,8 @@
 using System.Diagnostics;
+using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Navigation;
+using ResxTranslationTool.Models;
 using ResxTranslationTool.ViewModels;
 
 namespace ResxTranslationTool.Views
@@ -21,5 +24,16 @@ private void homePageRequestNavigate(object sender, RequestNavigateEventArgs e)
             Process.Start(e.Uri.AbsoluteUri);
             e.Handled = true;
         }
+
+        private void TranslationRow_DoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            var row = (DataGridRow)sender;
+            var translation = (Translation)row.DataContext;
+
+            if (string.IsNullOrEmpty(translation.TranslatedText))
+            {
+                translation.TranslatedText = translation.OriginalText;
+            }
+        }
     }
 }