diff --git a/src/BreCalClient/SearchFilterControl.xaml b/src/BreCalClient/SearchFilterControl.xaml
index b2a941a..a25805c 100644
--- a/src/BreCalClient/SearchFilterControl.xaml
+++ b/src/BreCalClient/SearchFilterControl.xaml
@@ -89,8 +89,7 @@
                 <ColumnDefinition Width="30" />
                 <ColumnDefinition Width=".5*" />
             </Grid.ColumnDefinitions>
-            <xctk:WatermarkTextBox x:Name="textBoxSearch" Grid.Column="0" Margin="2" Watermark="{x:Static p:Resources.textEnterKeyword}" PreviewTextInput="textBoxSearch_PreviewTextInput" 
-                               DataObject.Pasting="textBoxSearch_Pasting" TextChanged="textBoxSearch_TextChanged" />
+            <xctk:WatermarkTextBox x:Name="textBoxSearch" Grid.Column="0" Margin="2" Watermark="{x:Static p:Resources.textEnterKeyword}" TextChanged="textBoxSearch_TextChanged" />
             <CheckBox x:Name="checkBoxOwn" VerticalAlignment="Center" Grid.Column="1" HorizontalAlignment="Right" Margin="2" Checked="checkBoxOwn_Checked" Unchecked="checkBoxOwn_Checked" />
             <Label Content="{x:Static p:Resources.textMineOnly}" Grid.Column="2" />
         </Grid>
diff --git a/src/BreCalClient/SearchFilterControl.xaml.cs b/src/BreCalClient/SearchFilterControl.xaml.cs
index 92ac773..d9fe083 100644
--- a/src/BreCalClient/SearchFilterControl.xaml.cs
+++ b/src/BreCalClient/SearchFilterControl.xaml.cs
@@ -183,23 +183,11 @@ namespace BreCalClient
             foreach (Participant agency in comboBoxAgencies.SelectedItems)
                 _model.Agencies.Add(agency.Id);
             SearchFilterChanged?.Invoke();
-        }        
-
-        private void textBoxSearch_Pasting(object sender, System.Windows.DataObjectPastingEventArgs e)
-        {
-            this.SearchFilter.SearchString = e.SourceDataObject.ToString();
-            SearchFilterChanged?.Invoke();
-        }
-
-        private void textBoxSearch_PreviewTextInput(object sender, TextCompositionEventArgs e)
-        {
-            this.SearchFilter.SearchString = this.textBoxSearch.Text + e.Text;
-            SearchFilterChanged?.Invoke();
-        }
+        }                
 
         private void textBoxSearch_TextChanged(object sender, TextChangedEventArgs e)
         {
-            this.SearchFilter.SearchString = this.textBoxSearch.Text;
+            this.SearchFilter.SearchString = this.textBoxSearch.Text.Trim();
             SearchFilterChanged?.Invoke();
         }