diff --git a/PseudoEditor/MainWindow.xaml b/PseudoEditor/MainWindow.xaml
index a69eec4..7ec4ff0 100644
--- a/PseudoEditor/MainWindow.xaml
+++ b/PseudoEditor/MainWindow.xaml
@@ -7,7 +7,7 @@
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:avalonEdit="clr-namespace:ICSharpCode.AvalonEdit;assembly=ICSharpCode.AvalonEdit"
         mc:Ignorable="d"
-        Title="PseudoEditor" Height="600" Width="800" MinHeight="400" MinWidth="400"
+        Title="PseudoEditor - NewFile*" Height="600" Width="800" MinHeight="400" MinWidth="400"
         TextElement.Foreground="{DynamicResource MaterialDesignBody}"
         TextElement.FontWeight="Regular"
         TextElement.FontSize="13"
@@ -125,7 +125,8 @@
 		
 		<avalonEdit:TextEditor x:Name="Editor" Grid.Row="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
 		                       HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
-		                       FontFamily="Consolas" ShowLineNumbers="True" FontSize="16">
+		                       FontFamily="Consolas" ShowLineNumbers="True" FontSize="16"
+		                       TextChanged="Editor_OnTextChanged">
 			<avalonEdit:TextEditor.ContextMenu>
 				<ContextMenu>
 					<MenuItem Header="{Binding Source={x:Static local:StringResources.Cut}}" Command="Cut">
@@ -158,7 +159,7 @@
 					<ColumnDefinition Width="Auto" MinWidth="75"/>
 				</Grid.ColumnDefinitions>
 				
-				<Label x:Name="LabelFilename" Grid.Column="0" Content="Filename"/>
+				<Label x:Name="LabelFilename" Grid.Column="0" Content="New file*"/>
 				<Label Grid.Column="2" Content="Ln"/>
 				<Label x:Name="LabelLines" Grid.Column="3"/>
 				<Label Grid.Column="4" Content="Col"/>
diff --git a/PseudoEditor/MainWindow.xaml.cs b/PseudoEditor/MainWindow.xaml.cs
index 322aa2f..a6f3971 100644
--- a/PseudoEditor/MainWindow.xaml.cs
+++ b/PseudoEditor/MainWindow.xaml.cs
@@ -24,10 +24,34 @@ namespace PseudoEditor
 	public partial class MainWindow : Window
 	{
 		private string _currentFileName;
+		private const string ProgramName = "PseudoEditor";
 
 		public MainWindow()
 		{
 			InitializeComponent();
+
+			Editor.Focus();
+
+			ShowLineColumn();
+			Editor.TextArea.Caret.PositionChanged += (sender, args) => ShowLineColumn();
+		}
+
+		private void ShowLineColumn()
+		{
+			LabelLines.Content = Editor.TextArea.Caret.Line;
+			LabelColumns.Content = Editor.TextArea.Caret.Column;
+		}
+
+		private void ShowFileName()
+		{
+			LabelFilename.Content = _currentFileName;
+			Title = $"{ProgramName} - {_currentFileName}";
+		}
+
+		private void ShowFileNameChanged()
+		{
+			LabelFilename.Content = $"{_currentFileName}*";
+			Title = $"{ProgramName} - {_currentFileName}*";
 		}
 
 		private void New_Executed(object sender, ExecutedRoutedEventArgs e)
@@ -61,6 +85,7 @@ private void Open_Executed(object sender, ExecutedRoutedEventArgs e)
 			{
 				_currentFileName = dialog.FileName;
 				Editor.Load(_currentFileName);
+				ShowFileName();
 			}
 		}
 
@@ -73,6 +98,7 @@ private void Save_Executed(object sender, ExecutedRoutedEventArgs e)
 			else
 			{
 				Editor.Save(_currentFileName);
+				ShowFileName();
 			}
 		}
 
@@ -91,6 +117,7 @@ private void SaveAs_Executed(object sender, ExecutedRoutedEventArgs e)
 			{
 				_currentFileName = dialog.FileName;
 				Editor.Save(_currentFileName);
+				ShowFileName();
 			}
 		}
 
@@ -98,5 +125,13 @@ private void Close_Executed(object sender, ExecutedRoutedEventArgs e)
 		{
 			this.Close();
 		}
+
+		private void Editor_OnTextChanged(object sender, EventArgs e)
+		{
+			if (_currentFileName != null)
+			{
+				ShowFileNameChanged();
+			}
+		}
 	}
 }
diff --git a/PseudoEditor/PseudoEditor.csproj b/PseudoEditor/PseudoEditor.csproj
index 411a2ea..2dc9731 100644
--- a/PseudoEditor/PseudoEditor.csproj
+++ b/PseudoEditor/PseudoEditor.csproj
@@ -76,15 +76,8 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="NewFileDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="NewFileDialog.xaml.cs">
-      <DependentUpon>NewFileDialog.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>