From b98cfad0c0a2410dfbf0258c6d7b80032b65dd07 Mon Sep 17 00:00:00 2001
From: Nic Bollis <nbollis@comcast.net>
Date: Mon, 4 Nov 2024 11:44:11 -0600
Subject: [PATCH] Update Numerical Inputs (#2433)

* Updated to MzLib 1.0.548 and fixed custom ions in search tasks

* reverted calibration task change

* merged in master bbbyy

* Spectral Library from Command Line (#2386)

* Updated to MzLib 1.0.548 and fixed custom ions in search tasks

* reverted calibration task change

* merged in master bbbyy

* Enabled Library Loading from command line

* Add alignment properties and key handling to TextBoxControls

- Added `HorizontalContentAlignment` and `VerticalContentAlignment` properties to center content in `DoubleTextBoxControl` and `IntegerTextBoxControl`.
- Introduced constructors to set alignment properties.
- Overrode `OnKeyDown` to clear focus on Return key press.
- Included `System.Windows` namespace in both control files.

* Replace TextBox with custom numeric controls in XAML

Replaced standard TextBox controls with custom IntegerTexBoxControl and DoubleTextBoxControl in various XAML files to improve input validation and user experience. Removed the CheckIfNumber event handler and method from code-behind files as the new custom controls handle validation internally. Updated tooltips and adjusted layout properties for consistency.

---------

Co-authored-by: Nic Bollis <nbollis@wisc.edu>
Co-authored-by: Edwin Laboy <63374885+elaboy@users.noreply.github.com>
---
 .../GUI/TaskWindows/CalibrateTaskWindow.xaml  | 36 ++++-----
 .../TaskWindows/CalibrateTaskWindow.xaml.cs   |  5 --
 .../GUI/TaskWindows/GPTMDTaskWindow.xaml      | 48 +++++------
 .../GUI/TaskWindows/GPTMDTaskWindow.xaml.cs   |  5 --
 .../TaskWindows/GlycoSearchTaskWindow.xaml    | 30 +++----
 .../TaskWindows/GlycoSearchTaskWindow.xaml.cs |  5 --
 .../GUI/TaskWindows/SearchTaskWindow.xaml     | 79 ++++++++++---------
 .../GUI/TaskWindows/SearchTaskWindow.xaml.cs  |  6 --
 .../GUI/TaskWindows/XLSearchTaskWindow.xaml   | 22 +++---
 .../TaskWindows/XLSearchTaskWindow.xaml.cs    |  5 --
 MetaMorpheus/GUI/Util/DoubleTexBoxControl.cs  | 20 ++++-
 .../GUI/Util/IntegerTextBoxControl.cs         | 24 +++++-
 .../Views/FileSpecificParametersWindow.xaml   | 12 +--
 .../FileSpecificParametersWindow.xaml.cs      |  5 --
 14 files changed, 156 insertions(+), 146 deletions(-)

diff --git a/MetaMorpheus/GUI/TaskWindows/CalibrateTaskWindow.xaml b/MetaMorpheus/GUI/TaskWindows/CalibrateTaskWindow.xaml
index 0769a279a..99c3f48de 100644
--- a/MetaMorpheus/GUI/TaskWindows/CalibrateTaskWindow.xaml
+++ b/MetaMorpheus/GUI/TaskWindows/CalibrateTaskWindow.xaml
@@ -92,13 +92,13 @@
                                 <StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="maxMissedCleavageLabel" Content="Max Missed Cleavages" />
-                                        <TextBox x:Name="MissedCleavagesTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
+                                        <local:IntegerTexBoxControl x:Name="MissedCleavagesTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                     Maximum number of missed proteolytic cleavages allowed.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="proteaseLabel" Content="Protease" />
@@ -114,47 +114,47 @@
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="lblMinPeptideLength" Content="Min Peptide Len" />
-                                        <TextBox x:Name="MinPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MinPeptideLengthTextBox"  Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                         The minimum allowed peptide length. Must be a positive, non-zero integer.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                     <Label x:Name="lblMaxPeptideLength" Content="Max Peptide Len" />
-                                        <TextBox x:Name="MaxPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
+                                        <local:IntegerTexBoxControl x:Name="MaxPeptideLengthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                         The maximum allowed peptide length. Leave empty for no limitation.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="LbMinVariantDepth" Content="Min read depth for variants" />
-                                        <TextBox x:Name="MinVariantDepthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MinVariantDepthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                     The minimum number of reads to consider a nucleic acid sequence variant.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="LbMaxHeterozygousVariants" Content="Max heterozygous variants for combinitorics" />
-                                        <TextBox x:Name="MaxHeterozygousVariantsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MaxHeterozygousVariantsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                     The maximum number of heterozygous variants for combinitorics.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="MinimumScoreLabel" Content="Minimum score allowed:" />
-                                        <TextBox x:Name="MinScoreAllowed" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MinScoreAllowed" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                     The minimum MetaMorpheus score allowed for a PSM to be reportable.
@@ -162,7 +162,7 @@
                                                     Decreasing this number increases search time.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                 </StackPanel>
                                 <StackPanel Grid.Column="1">
@@ -188,17 +188,17 @@
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="MaxModsPerPeptideLabel" Content="Max Mods Per Peptide" />
-                                        <TextBox x:Name="MaxModsPerPeptideTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MaxModsPerPeptideTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                     The maximum number of modifications allowed on a single isoform.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="MaxModificationIsoformsLabel" Content="Max Modification Isoforms" />
-                                        <TextBox x:Name="MaxModificationIsoformsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MaxModificationIsoformsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                         The maximum number of isoforms (sequences with modifications) allowed from a given unmodified "base-sequence". 
@@ -206,7 +206,7 @@
                                                         This prevents highly ambiguous regions from greatly expanding the search space.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="ionsToSearchLabel" Content="Dissociation Type" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
@@ -220,7 +220,7 @@
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label Content="Max Threads" />
-                                        <TextBox x:Name="MaxThreadsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MaxThreadsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                         By default, MetaMorpheus uses this machine's number of threads minus one to maximize search speed while letting you use your computer for other purposes.
@@ -228,7 +228,7 @@
                                                         Enter a lower number to limit CPU usage.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                 </StackPanel>
                             </Grid>
diff --git a/MetaMorpheus/GUI/TaskWindows/CalibrateTaskWindow.xaml.cs b/MetaMorpheus/GUI/TaskWindows/CalibrateTaskWindow.xaml.cs
index 68aa2fc4c..12b88340b 100644
--- a/MetaMorpheus/GUI/TaskWindows/CalibrateTaskWindow.xaml.cs
+++ b/MetaMorpheus/GUI/TaskWindows/CalibrateTaskWindow.xaml.cs
@@ -299,11 +299,6 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
             DialogResult = true;
         }
 
-        private void CheckIfNumber(object sender, TextCompositionEventArgs e)
-        {
-            e.Handled = GlobalGuiSettings.CheckIsPositiveInteger(e.Text);
-        }
-
         private void KeyPressed(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Return)
diff --git a/MetaMorpheus/GUI/TaskWindows/GPTMDTaskWindow.xaml b/MetaMorpheus/GUI/TaskWindows/GPTMDTaskWindow.xaml
index 48060ddd7..bfb5d6c8a 100644
--- a/MetaMorpheus/GUI/TaskWindows/GPTMDTaskWindow.xaml
+++ b/MetaMorpheus/GUI/TaskWindows/GPTMDTaskWindow.xaml
@@ -66,13 +66,13 @@
                                     </CheckBox>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label Content="Deconvolution Max Assumed Charge State" />
-                                        <TextBox x:Name="DeconvolutionMaxAssumedChargeStateTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="DeconvolutionMaxAssumedChargeStateTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                     The maximum charge state that deconvolution should allow. Minimum is 1.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                 </StackPanel>
                             </GroupBox>
@@ -90,19 +90,19 @@
                                     </CheckBox>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label Content="Top N peaks per m/z window" />
-                                        <TextBox x:Name="NumberOfPeaksToKeepPerWindowTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="NumberOfPeaksToKeepPerWindowTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <ToolTipService.ToolTip>
                                                 <ToolTip Content="Use the N most intense peaks from the spectrum and remove all other peaks" />
                                             </ToolTipService.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label Content="Minimum intensity ratio" />
-                                        <TextBox x:Name="MinimumAllowedIntensityRatioToBasePeakTexBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:DoubleTextBoxControl x:Name="MinimumAllowedIntensityRatioToBasePeakTexBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <ToolTipService.ToolTip>
                                                 <ToolTip Content="Peaks must be this intense compared to the base peak" />
                                             </ToolTipService.ToolTip>
-                                        </TextBox>
+                                        </local:DoubleTextBoxControl>
                                     </StackPanel>
                                 </StackPanel>
                             </GroupBox>
@@ -156,13 +156,13 @@
                                 <StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="maxMissedCleavageLabel" Content="Max Missed Cleavages" />
-                                        <TextBox x:Name="MissedCleavagesTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
+                                        <local:IntegerTexBoxControl x:Name="MissedCleavagesTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                     Maximum number of missed proteolytic cleavages allowed.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="proteaseLabel" Content="Protease" />
@@ -178,47 +178,47 @@
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="lblMinPeptideLength" Content="Min Peptide Len" />
-                                        <TextBox x:Name="MinPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MinPeptideLengthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                         The minimum allowed peptide length. Must be a positive, non-zero integer.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="lblMaxPeptideLength" Content="Max Peptide Len" />
-                                        <TextBox x:Name="MaxPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
+                                        <local:IntegerTexBoxControl x:Name="MaxPeptideLengthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                         The maximum allowed peptide length. Leave empty for no limitation.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="LbMinVariantDepth" Content="Min Read Depth for Variants" />
-                                        <TextBox x:Name="MinVariantDepthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MinVariantDepthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                     The minimum number of reads to consider a nucleic acid sequence variant.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="LbMaxHeterozygousVariants" Content="Max Heterozygous variants for Combinitorics" />
-                                        <TextBox x:Name="MaxHeterozygousVariantsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MaxHeterozygousVariantsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                     The maximum number of heterozygous variants for combinitorics.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="minimumScoreLabel" Content="Minimum Score Allowed:" />
-                                        <TextBox x:Name="MinScoreAllowed" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MinScoreAllowed" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                     The minimum MetaMorpheus score allowed for a PSM to be reportable.
@@ -226,7 +226,7 @@
                                                     Decreasing this number increases search time.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                 </StackPanel>
                                 <StackPanel Grid.Column="1">
@@ -242,7 +242,7 @@
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="maxModificationIsoformsLabel" Content="Max Modification Isoforms" />
-                                        <TextBox x:Name="MaxModificationIsoformsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MaxModificationIsoformsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                         The maximum number of isoforms (sequences with modifications) allowed from a given unmodified "base-sequence". 
@@ -250,11 +250,11 @@
                                                         This prevents highly ambiguous regions from greatly expanding the search space.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="MaxModsPerPeptideLabel" Content="Max Mods Per Peptide Before GPTMD" />
-                                        <TextBox x:Name="MaxModsPerPeptideTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MaxModsPerPeptideTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                         The maximum number of modifications allowed on a single iteration of a given peptide sequence. 
@@ -269,7 +269,7 @@
                                                         In MetaMorpheus near the top left, click "Data", select "Open folder with mods/data files", and open the "Data" folder.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label x:Name="ionsToSearchLabel" Content="Dissociation Type" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
@@ -283,7 +283,7 @@
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label Content="Max Threads" />
-                                        <TextBox x:Name="MaxThreadsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                        <local:IntegerTexBoxControl x:Name="MaxThreadsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                             <TextBox.ToolTip>
                                                 <TextBlock>
                                                         By default, MetaMorpheus uses this machine's number of threads minus one to maximize search speed while letting you use your computer for other purposes.
@@ -291,7 +291,7 @@
                                                         Enter a lower number to limit CPU usage.
                                                 </TextBlock>
                                             </TextBox.ToolTip>
-                                        </TextBox>
+                                        </local:IntegerTexBoxControl>
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <CheckBox x:Name="AddCompIonCheckBox" Content="Generate Complementary Ions" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
diff --git a/MetaMorpheus/GUI/TaskWindows/GPTMDTaskWindow.xaml.cs b/MetaMorpheus/GUI/TaskWindows/GPTMDTaskWindow.xaml.cs
index fa0270c33..4c3449f93 100644
--- a/MetaMorpheus/GUI/TaskWindows/GPTMDTaskWindow.xaml.cs
+++ b/MetaMorpheus/GUI/TaskWindows/GPTMDTaskWindow.xaml.cs
@@ -481,11 +481,6 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
             DialogResult = true;
         }
 
-        private void CheckIfNumber(object sender, TextCompositionEventArgs e)
-        {
-            e.Handled = GlobalGuiSettings.CheckIsPositiveInteger(e.Text);
-        }
-
         private void KeyPressed(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Return)
diff --git a/MetaMorpheus/GUI/TaskWindows/GlycoSearchTaskWindow.xaml b/MetaMorpheus/GUI/TaskWindows/GlycoSearchTaskWindow.xaml
index 0c0d9265b..7be5c8b7d 100644
--- a/MetaMorpheus/GUI/TaskWindows/GlycoSearchTaskWindow.xaml
+++ b/MetaMorpheus/GUI/TaskWindows/GlycoSearchTaskWindow.xaml
@@ -114,7 +114,7 @@
                                 </StackPanel>
                                 <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="5">
                                     <Label Content="Keep top N candidates" />
-                                    <TextBox x:Name="txtTopNum" PreviewTextInput="CheckIfNumber" Width="45" Margin="2" IsEnabled="{Binding IsChecked, ElementName=ckbTopNum}" />
+                                    <local:IntegerTexBoxControl x:Name="txtTopNum"  Width="45" Margin="2" IsEnabled="{Binding IsChecked, ElementName=ckbTopNum}" />
                                 </StackPanel>
                                 <StackPanel Orientation="Horizontal" Margin="5" Grid.Row="2">
                                     <Label Content="Data Type    "/>
@@ -139,7 +139,7 @@
                                 </StackPanel>
                                 <StackPanel Orientation="Horizontal" Grid.Row="3">
                                     <Label Content="Maximum OGlycan Allowed"/>
-                                    <TextBox x:Name="TbMaxOGlycanNum" PreviewTextInput="CheckIfNumber" Width="45"/>
+                                    <local:IntegerTexBoxControl x:Name="TbMaxOGlycanNum" Width="45"/>
                                 </StackPanel>
                                 <CheckBox x:Name="CkbOxoniumIonFilt" Content="OxoniumIonFilt" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center"/>
                             </Grid>
@@ -179,11 +179,11 @@
                                     <CheckBox x:Name="trimMsMs" Content="Trim MS2 Peaks"/>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label Content="Top N peaks" />
-                                        <TextBox x:Name="TopNPeaksTextBox"  PreviewTextInput="CheckIfNumber" Width="45" />
+                                        <local:IntegerTexBoxControl x:Name="TopNPeaksTextBox"   Width="45" />
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label Content="Minimum ratio" />
-                                        <TextBox x:Name="MinRatioTextBox"  PreviewTextInput="CheckIfNumber" Width="45" />
+                                        <local:DoubleTextBoxControl x:Name="MinRatioTextBox"  Width="45" />
                                     </StackPanel>
                                 </StackPanel>
                             </GroupBox>
@@ -215,7 +215,7 @@
                                         </RadioButton>
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="label1" Content="Max Missed Cleavages" />
-                                            <TextBox x:Name="missedCleavagesTextBox" PreviewTextInput="CheckIfNumber"  Width="45" TextChanged="NonSpecificUpdate"/>
+                                            <local:IntegerTexBoxControl x:Name="missedCleavagesTextBox" Width="45" TextChanged="NonSpecificUpdate"/>
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="label_Copy" Content="Protease" />
@@ -223,7 +223,7 @@
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="1">
                                             <Label x:Name="label2" Content="Number of Database Partitions" />
-                                            <TextBox x:Name="numberOfDatabaseSearchesTextBox" PreviewTextInput="CheckIfNumber" Width="45" />
+                                            <local:IntegerTexBoxControl x:Name="numberOfDatabaseSearchesTextBox" Width="45" />
                                         </StackPanel>
                                     </StackPanel>
                                     <StackPanel Grid.Column="1">
@@ -233,17 +233,17 @@
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="label55_Copy" Content="Max Modification Isoforms" />
-                                            <TextBox x:Name="maxModificationIsoformsTextBox" PreviewTextInput="CheckIfNumber" Width="45" />
+                                            <local:IntegerTexBoxControl x:Name="maxModificationIsoformsTextBox" Width="45" />
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="Lb_MaxMods" Content="Max Modification Per Peptide" />
-                                            <TextBox x:Name="TxtBoxMaxModPerPep" PreviewTextInput="CheckIfNumber" Width="45" />
+                                            <local:IntegerTexBoxControl x:Name="TxtBoxMaxModPerPep"  Width="45" />
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="lblMinPeptideLength" Content="Min Peptide Len" />
-                                            <TextBox x:Name="MinPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" />
+                                            <local:IntegerTexBoxControl x:Name="MinPeptideLengthTextBox" Width="45" />
                                             <Label x:Name="lblMaxPeptideLength" Content="Max Peptide Len" />
-                                            <TextBox x:Name="MaxPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" TextChanged="NonSpecificUpdate"/>
+                                            <local:IntegerTexBoxControl x:Name="MaxPeptideLengthTextBox" Width="45" TextChanged="NonSpecificUpdate"/>
                                         </StackPanel>
                                     </StackPanel>
                                 </Grid>
@@ -270,11 +270,11 @@
                                     <StackPanel Grid.Column="2">
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="ffdf" Content="Minimum score allowed:" />
-                                            <TextBox x:Name="minScoreAllowed" PreviewTextInput="CheckIfNumber" Width="45" />
+                                            <local:IntegerTexBoxControl x:Name="minScoreAllowed" Width="45" />
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label Content="Max Threads" />
-                                            <TextBox x:Name="maxThreadsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                            <local:IntegerTexBoxControl x:Name="maxThreadsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                 <TextBox.ToolTip>
                                                     <TextBlock>
                                                         By default, MetaMorpheus uses this machine's number of threads minus one to maximize search speed while letting you use your computer for other purposes.
@@ -282,7 +282,7 @@
                                                         Enter a lower number to limit CPU usage.
                                                     </TextBlock>
                                                 </TextBox.ToolTip>
-                                            </TextBox>
+                                            </local:IntegerTexBoxControl>
                                         </StackPanel>
                                     </StackPanel>
                                 </Grid>
@@ -448,7 +448,7 @@
                             </ToolTipService.ToolTip>
                         </RadioButton>
                         <StackPanel Orientation="Horizontal">
-                            <TextBox x:Name="PeakFindingToleranceTextBox"  PreviewTextInput="CheckIfNumber" Width="30" Height="20">
+                            <local:DoubleTextBoxControl x:Name="PeakFindingToleranceTextBox" Width="30" Height="20">
                                 <TextBox.IsEnabled>
                                     <MultiBinding Converter="{StaticResource boolOrConverter}">
                                         <Binding  ElementName="CheckBoxLFQ" Path ="IsChecked"/>
@@ -457,7 +457,7 @@
                                 <ToolTipService.ToolTip>
                                     <ToolTip Content="PPM tolerance for MS1 (LFQ) peakfinding" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" />
                                 </ToolTipService.ToolTip>
-                            </TextBox>
+                            </local:DoubleTextBoxControl>
                             <Label x:Name="peakFindingLabel" Content=" ppm peakfinding tolerance">
                                 <Label.IsEnabled>
                                     <MultiBinding Converter="{StaticResource boolOrConverter}">
diff --git a/MetaMorpheus/GUI/TaskWindows/GlycoSearchTaskWindow.xaml.cs b/MetaMorpheus/GUI/TaskWindows/GlycoSearchTaskWindow.xaml.cs
index eb28a08cd..e63556f94 100644
--- a/MetaMorpheus/GUI/TaskWindows/GlycoSearchTaskWindow.xaml.cs
+++ b/MetaMorpheus/GUI/TaskWindows/GlycoSearchTaskWindow.xaml.cs
@@ -58,11 +58,6 @@ public GlycoSearchTaskWindow(GlycoSearchTask task)
 
         internal GlycoSearchTask TheTask { get; private set; }
 
-        private void CheckIfNumber(object sender, TextCompositionEventArgs e)
-        {
-            e.Handled = GlobalGuiSettings.CheckIsPositiveInteger(e.Text);
-        }
-
         private void PopulateChoices()
         {
             ChildScanDissociationTypeComboBox.Items.Add("Null");
diff --git a/MetaMorpheus/GUI/TaskWindows/SearchTaskWindow.xaml b/MetaMorpheus/GUI/TaskWindows/SearchTaskWindow.xaml
index 9f3205c57..98514670c 100644
--- a/MetaMorpheus/GUI/TaskWindows/SearchTaskWindow.xaml
+++ b/MetaMorpheus/GUI/TaskWindows/SearchTaskWindow.xaml
@@ -7,7 +7,8 @@
         xmlns:guiFunctions="clr-namespace:GuiFunctions;assembly=GuiFunctions"
         mc:Ignorable="d"
         KeyDown="KeyPressed"
-        Title="Search Task" Width="750" Height="725" WindowStartupLocation="CenterScreen">
+        Title="Search Task" Width="750" Height="725" d:DesignHeight="1500"
+        WindowStartupLocation="CenterScreen">
     <Window.Resources>
         <local:BooleanInverter x:Key="InvertedBooleanConverter" />
 
@@ -147,7 +148,7 @@
                                 <!-- Max missed cleavages -->
                                 <StackPanel Orientation="Horizontal" Margin="5 5 5 0" Grid.Column="0" Grid.Row="1">
                                     <Label x:Name="maxMissedCleavagesLabel" Content="Max Missed Cleavages:" Width="150" />
-                                    <TextBox x:Name="MissedCleavagesTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
+                                    <local:IntegerTexBoxControl x:Name="MissedCleavagesTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
                                         <TextBox.ToolTip>
                                             <TextBlock>
                                     Maximum number of missed proteolytic cleavages allowed.
@@ -155,7 +156,7 @@
                                     Semi-specific cleavages do not count toward this.
                                             </TextBlock>
                                         </TextBox.ToolTip>
-                                    </TextBox>
+                                    </local:IntegerTexBoxControl>
                                 </StackPanel>
 
                                 <!-- Protease -->
@@ -202,37 +203,37 @@
                                 <!-- Min peptide lengths -->
                                 <StackPanel Orientation="Horizontal" Margin="5 5 5 0" Grid.Column="0" Grid.Row="3">
                                     <Label x:Name="lblMinPeptideLength" Content="Min Peptide Length:" Width="150" />
-                                    <TextBox x:Name="MinPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                    <local:IntegerTexBoxControl x:Name="MinPeptideLengthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                         <TextBox.ToolTip>
                                             <TextBlock>
                                                     The minimum allowed peptide length. Must be a positive, non-zero integer.
                                             </TextBlock>
                                         </TextBox.ToolTip>
-                                    </TextBox>
+                                    </local:IntegerTexBoxControl>
                                 </StackPanel>
 
                                 <!-- Max peptide lengths -->
                                 <StackPanel Orientation="Horizontal" Margin="5 5 5 0" Grid.Column="0" Grid.Row="4">
                                     <Label x:Name="lblMaxPeptideLength" Content="Max Peptide Length:" Width="150" />
-                                    <TextBox x:Name="MaxPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
+                                    <local:IntegerTexBoxControl x:Name="MaxPeptideLengthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
                                         <TextBox.ToolTip>
                                             <TextBlock>
                                                     The maximum allowed peptide length. Leave empty for no limitation.
                                             </TextBlock>
                                         </TextBox.ToolTip>
-                                    </TextBox>
+                                    </local:IntegerTexBoxControl>
                                 </StackPanel>
 
                                 <!-- Max mods per peptide -->
                                 <StackPanel Orientation="Horizontal" Margin="5 5 5 0" Grid.Column="0" Grid.Row="2">
                                     <Label x:Name="lbMaxModNum" Content="Max Mods Per Peptide:" Width="150" />
-                                    <TextBox x:Name="MaxModNumTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                    <local:IntegerTexBoxControl x:Name="MaxModNumTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                         <TextBox.ToolTip>
                                             <TextBlock>
                                                     The maximum number of modifications allowed on a single isoform.
                                             </TextBlock>
                                         </TextBox.ToolTip>
-                                    </TextBox>
+                                    </local:IntegerTexBoxControl>
                                 </StackPanel>
 
                                 <!-- Q-Value Filter -->
@@ -465,7 +466,7 @@
 
                             <!-- LFQ Options -->
                             <StackPanel Orientation="Horizontal">
-                                <TextBox x:Name="PeakFindingToleranceTextBox"  PreviewTextInput="CheckIfNumber" Width="30" Height="20">
+                                <local:DoubleTextBoxControl x:Name="PeakFindingToleranceTextBox" Width="30" Height="20">
                                     <TextBox.IsEnabled>
                                         <MultiBinding Converter="{StaticResource boolOrConverter}">
                                             <Binding  ElementName="CheckBoxLFQ" Path ="IsChecked"/>
@@ -481,7 +482,7 @@
                                     <ToolTipService.ToolTip>
                                         <ToolTip Content="PPM tolerance for MS1 (LFQ) peakfinding" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" />
                                     </ToolTipService.ToolTip>
-                                </TextBox>
+                                </local:DoubleTextBoxControl>
                                 <Label x:Name="peakFindingLabel" Content=" ppm peakfinding tolerance">
                                     <Label.IsEnabled>
                                         <MultiBinding Converter="{StaticResource boolOrConverter}">
@@ -609,7 +610,7 @@
                                     </Grid.ColumnDefinitions>
 
                                     <Label x:Name="minScoreAllowedLabel" Content="    Minimum score allowed:" HorizontalContentAlignment="Left"/>
-                                    <TextBox x:Name="MinScoreAllowed" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                    <local:IntegerTexBoxControl x:Name="MinScoreAllowed"  Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                         <TextBox.ToolTip>
                                             <TextBlock>
                                             The minimum MetaMorpheus score allowed for a PSM to be reportable.
@@ -617,7 +618,7 @@
                                             Decreasing this number increases search time.
                                             </TextBlock>
                                         </TextBox.ToolTip>
-                                    </TextBox>
+                                    </local:IntegerTexBoxControl>
                                 </Grid>
                             </StackPanel>
                             
@@ -685,13 +686,13 @@
 
                                             <StackPanel Orientation="Horizontal" Margin="5">
                                                 <Label Content="Deconvolution Max Assumed Charge State:" />
-                                                <TextBox x:Name="DeconvolutionMaxAssumedChargeStateTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:IntegerTexBoxControl x:Name="DeconvolutionMaxAssumedChargeStateTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <TextBox.ToolTip>
                                                         <TextBlock>
                                                     The maximum charge state that deconvolution should allow. Minimum is 1.
                                                         </TextBlock>
                                                     </TextBox.ToolTip>
-                                                </TextBox>
+                                                </local:IntegerTexBoxControl>
                                             </StackPanel>
                                         </StackPanel>
                                     </GroupBox>
@@ -713,35 +714,35 @@
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="5">
                                                 <Label Content="Top N peaks per m/z window:" Width="193" />
-                                                <TextBox x:Name="NumberOfPeaksToKeepPerWindowTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:IntegerTexBoxControl x:Name="NumberOfPeaksToKeepPerWindowTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <ToolTipService.ToolTip>
                                                         <ToolTip Content="Use the N most intense peaks from the spectrum and remove all other peaks" />
                                                     </ToolTipService.ToolTip>
-                                                </TextBox>
+                                                </local:IntegerTexBoxControl>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="5">
                                                 <Label Content="Minimum intensity ratio:" Width="193" />
-                                                <TextBox x:Name="MinimumAllowedIntensityRatioToBasePeakTexBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:DoubleTextBoxControl x:Name="MinimumAllowedIntensityRatioToBasePeakTexBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <ToolTipService.ToolTip>
                                                         <ToolTip Content="Peaks must be this intense compared to the base peak" />
                                                     </ToolTipService.ToolTip>
-                                                </TextBox>
+                                                </local:DoubleTextBoxControl>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="5">
                                                 <Label Content="Nominal window width Thomsons:" />
-                                                <TextBox x:Name="WindowWidthThomsonsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:DoubleTextBoxControl x:Name="WindowWidthThomsonsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <ToolTipService.ToolTip>
                                                         <ToolTip Content="Divide the MS2 spectrum into windows N-Thomsons wide before filtering peaks" />
                                                     </ToolTipService.ToolTip>
-                                                </TextBox>
+                                                </local:DoubleTextBoxControl>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="5">
                                                 <Label Content="Number of windows:" Width="193" />
-                                                <TextBox x:Name="NumberOfWindowsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:IntegerTexBoxControl x:Name="NumberOfWindowsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <ToolTipService.ToolTip>
                                                         <ToolTip Content="Divide the MS2 spectrum into an integer number of evenly sized windows before filtering peaks" />
                                                     </ToolTipService.ToolTip>
-                                                </TextBox>
+                                                </local:IntegerTexBoxControl>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="10,5,5,5">
                                                 <CheckBox x:Name="NormalizePeaksInWindowCheckBox" Content="Normalize peaks in each window" IsChecked="False" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
@@ -842,7 +843,7 @@
                                                         </Grid.ColumnDefinitions>
                                                         <StackPanel Grid.Column="1" Orientation="Horizontal">
                                                             <Label x:Name="numerOfDatabaseSearchesLabel" Content="Number of Database Partitions:" />
-                                                            <TextBox x:Name="NumberOfDatabaseSearchesTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500"  IsEnabled="{Binding IsChecked, ElementName=ClassicSearchRadioButton, Converter={StaticResource InvertedBooleanConverter}}">
+                                                            <local:IntegerTexBoxControl x:Name="NumberOfDatabaseSearchesTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500"  IsEnabled="{Binding IsChecked, ElementName=ClassicSearchRadioButton, Converter={StaticResource InvertedBooleanConverter}}">
                                                                 <TextBox.ToolTip>
                                                                     <TextBlock>
                                                                 Splits indexed search modes (Modern, Semi-, Non-) into separate, smaller searches to reduce RAM requirements. More partitions means less RAM.
@@ -850,7 +851,7 @@
                                                                 There is no correlation between the number of partitions and the resulting search speed.
                                                                     </TextBlock>
                                                                 </TextBox.ToolTip>
-                                                            </TextBox>
+                                                            </local:IntegerTexBoxControl>
                                                         </StackPanel>
                                                     </Grid>
                                                 </StackPanel>
@@ -893,7 +894,7 @@
                                             </RadioButton>
                                             <StackPanel Orientation="Horizontal" Margin="2">
                                                 <Label x:Name="maxModificationIsoformsLabel" Content="Max Modification Isoforms:" Width="250" />
-                                                <TextBox x:Name="maxModificationIsoformsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:IntegerTexBoxControl x:Name="maxModificationIsoformsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <TextBox.ToolTip>
                                                         <TextBlock>
                                                         The maximum number of isoforms (sequences with modifications) allowed from a given unmodified "base-sequence".
@@ -901,27 +902,27 @@
                                                         This prevents highly ambiguous regions from greatly expanding the search space.
                                                         </TextBlock>
                                                     </TextBox.ToolTip>
-                                                </TextBox>
+                                                </local:IntegerTexBoxControl>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="2">
                                                 <Label x:Name="LbMinVariantDepth" Content="Min Read Depth for Variants:" Width="250" />
-                                                <TextBox x:Name="MinVariantDepthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:IntegerTexBoxControl x:Name="MinVariantDepthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <TextBox.ToolTip>
                                                         <TextBlock>
                                                     The minimum number of reads to consider a nucleic acid sequence variant.
                                                         </TextBlock>
                                                     </TextBox.ToolTip>
-                                                </TextBox>
+                                                </local:IntegerTexBoxControl>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="2">
                                                 <Label x:Name="LbMaxHeterozygousVariants" Content="Max Heterozygous Variants for Combinitorics:" Width="250" />
-                                                <TextBox x:Name="MaxHeterozygousVariantsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:IntegerTexBoxControl x:Name="MaxHeterozygousVariantsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <TextBox.ToolTip>
                                                         <TextBlock>
                                                     The maximum number of heterozygous variants for combinitorics.
                                                         </TextBlock>
                                                     </TextBox.ToolTip>
-                                                </TextBox>
+                                                </local:IntegerTexBoxControl>
                                             </StackPanel>
                                         </StackPanel>
                                     </GroupBox>
@@ -964,8 +965,8 @@
                                                     </CheckBox.ToolTip>
                                                 </CheckBox>
                                                 <Label x:Name="minInternalFragmentLengthLabel" Content="Min Internal Length:" Margin="18,-6,0,0" />
-                                                <TextBox x:Name="MinInternalFragmentLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" IsEnabled="{Binding IsChecked, ElementName=InternalIonsCheckBox}" 
-                                                         ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:IntegerTexBoxControl x:Name="MinInternalFragmentLengthTextBox" Width="45" IsEnabled="{Binding IsChecked, ElementName=InternalIonsCheckBox}" 
+                                                                            ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <TextBox.ToolTip>
                                                         <TextBlock>
                                                         Minimum length (number of amino acids) allowed for an internal fragment ion. 
@@ -973,11 +974,11 @@
                                                             Small internal fragments can be uninformative and computationally expensive.
                                                         </TextBlock>
                                                     </TextBox.ToolTip>
-                                                </TextBox>
+                                                </local:IntegerTexBoxControl>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="5">
                                                 <Label x:Name="maxFragmentSize" Content="Max Fragment Mass (Da):" Width="146" />
-                                                <TextBox x:Name="MaxFragmentMassTextBox" PreviewTextInput="CheckIfNumber" Width="45" IsEnabled="{Binding IsChecked, ElementName=ClassicSearchRadioButton, Converter={StaticResource InvertedBooleanConverter}}" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:DoubleTextBoxControl x:Name="MaxFragmentMassTextBox" Width="45" IsEnabled="{Binding IsChecked, ElementName=ClassicSearchRadioButton, Converter={StaticResource InvertedBooleanConverter}}" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <TextBox.ToolTip>
                                                         <TextBlock>
                                                         Indexed Search Only: Limits the maximum MS2 fragment mass to avoid rare crashes.
@@ -985,11 +986,11 @@
                                                         A very high value (e.g. 30000) does not impact performance.
                                                         </TextBlock>
                                                     </TextBox.ToolTip>
-                                                </TextBox>
+                                                </local:DoubleTextBoxControl>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="5">
                                                 <Label Content="Max Threads:" Width="146" />
-                                                <TextBox x:Name="MaxThreadsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                                <local:IntegerTexBoxControl x:Name="MaxThreadsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                     <TextBox.ToolTip>
                                                         <TextBlock>
                                                         By default, MetaMorpheus uses this machine's number of threads minus one to maximize search speed while letting you use your computer for other purposes.
@@ -997,7 +998,7 @@
                                                         Enter a lower number to limit CPU usage.
                                                         </TextBlock>
                                                     </TextBox.ToolTip>
-                                                </TextBox>
+                                                </local:IntegerTexBoxControl>
                                             </StackPanel>
                                         </StackPanel>
                                     </GroupBox>
@@ -1123,7 +1124,7 @@
                                             </CheckBox>
                                             <StackPanel Orientation="Horizontal">
                                                 <Label Content="Histogram bin width (Da):" IsEnabled="{Binding IsChecked, ElementName=CheckBoxHistogramAnalysis}" />
-                                                <TextBox x:Name="HistogramBinWidthTextBox" PreviewTextInput="CheckIfNumber" Width="45" Height="20" IsEnabled="{Binding IsChecked, ElementName=CheckBoxHistogramAnalysis}" />
+                                                <local:DoubleTextBoxControl x:Name="HistogramBinWidthTextBox"  Width="45" Height="20" IsEnabled="{Binding IsChecked, ElementName=CheckBoxHistogramAnalysis}" />
                                             </StackPanel>
                                         </StackPanel>
                                     </GroupBox>
diff --git a/MetaMorpheus/GUI/TaskWindows/SearchTaskWindow.xaml.cs b/MetaMorpheus/GUI/TaskWindows/SearchTaskWindow.xaml.cs
index 678e1392c..1767492b3 100644
--- a/MetaMorpheus/GUI/TaskWindows/SearchTaskWindow.xaml.cs
+++ b/MetaMorpheus/GUI/TaskWindows/SearchTaskWindow.xaml.cs
@@ -69,12 +69,6 @@ public SearchTaskWindow(SearchTask task)
             base.Closing += this.OnClosing;
         }
 
-
-        private void CheckIfNumber(object sender, TextCompositionEventArgs e)
-        {
-            e.Handled = GlobalGuiSettings.CheckIsPositiveInteger(e.Text);
-        }
-
         private void Row_DoubleClick(object sender, MouseButtonEventArgs e)
         {
             var ye = sender as DataGridCell;
diff --git a/MetaMorpheus/GUI/TaskWindows/XLSearchTaskWindow.xaml b/MetaMorpheus/GUI/TaskWindows/XLSearchTaskWindow.xaml
index 8c3ae3c27..81de1944f 100644
--- a/MetaMorpheus/GUI/TaskWindows/XLSearchTaskWindow.xaml
+++ b/MetaMorpheus/GUI/TaskWindows/XLSearchTaskWindow.xaml
@@ -81,7 +81,7 @@
                             </Grid>
                             <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="5">
                                 <Label Content="Keep top N candidates" />
-                                <TextBox x:Name="txtXLTopNum" PreviewTextInput="CheckIfNumber" Width="45" Margin="2" IsEnabled="{Binding IsChecked, ElementName=ckbXLTopNum}" />
+                                <local:IntegerTexBoxControl x:Name="txtXLTopNum" Width="45" Margin="2" IsEnabled="{Binding IsChecked, ElementName=ckbXLTopNum}" />
                             </StackPanel>
                             <StackPanel Orientation="Horizontal" Margin="5" Grid.Row="0" Grid.Column="1">
                                 <Label x:Name="ionsToSearchLabel" Content="MS2 Dissociation Type" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
@@ -167,11 +167,11 @@
                                     <CheckBox x:Name="trimMsMs" Content="Trim MS2 Peaks"/>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label Content="Top N peaks" />
-                                        <TextBox x:Name="TopNPeaksTextBox"  PreviewTextInput="CheckIfNumber" Width="45" />
+                                        <local:IntegerTexBoxControl x:Name="TopNPeaksTextBox" Width="45" />
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Margin="5">
                                         <Label Content="Minimum ratio" />
-                                        <TextBox x:Name="MinRatioTextBox"  PreviewTextInput="CheckIfNumber" Width="45" />
+                                        <local:DoubleTextBoxControl x:Name="MinRatioTextBox" Width="45" />
                                     </StackPanel>
                                 </StackPanel>
                             </GroupBox>
@@ -185,7 +185,7 @@
                                         <CheckBox x:Name="checkBoxDecoy" Content="Generate decoy proteins" Margin="5" DockPanel.Dock="Top" />
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="label1" Content="Max Missed Cleavages" />
-                                            <TextBox x:Name="missedCleavagesTextBox" PreviewTextInput="CheckIfNumber"  Width="45" TextChanged="NonSpecificUpdate"/>
+                                            <local:IntegerTexBoxControl x:Name="missedCleavagesTextBox" Width="45" TextChanged="NonSpecificUpdate"/>
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="label_Copy" Content="Protease" />
@@ -193,7 +193,7 @@
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="1">
                                             <Label x:Name="label2" Content="Number of Database Partitions" />
-                                            <TextBox x:Name="numberOfDatabaseSearchesTextBox" PreviewTextInput="CheckIfNumber" Width="45" />
+                                            <local:IntegerTexBoxControl x:Name="numberOfDatabaseSearchesTextBox" Width="45" />
                                         </StackPanel>
                                     </StackPanel>
                                     <StackPanel Grid.Column="1">
@@ -207,13 +207,13 @@
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="label55_Copy" Content="Max Modification Isoforms" />
-                                            <TextBox x:Name="maxModificationIsoformsTextBox" PreviewTextInput="CheckIfNumber" Width="45" />
+                                            <local:IntegerTexBoxControl x:Name="maxModificationIsoformsTextBox" Width="45" />
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="lblMinPeptideLength" Content="Min Peptide Len" />
-                                            <TextBox x:Name="MinPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" />
+                                            <local:IntegerTexBoxControl x:Name="MinPeptideLengthTextBox" Width="45" />
                                             <Label x:Name="lblMaxPeptideLength" Content="Max Peptide Len" />
-                                            <TextBox x:Name="MaxPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" TextChanged="NonSpecificUpdate"/>
+                                            <local:IntegerTexBoxControl x:Name="MaxPeptideLengthTextBox" Width="45" TextChanged="NonSpecificUpdate"/>
                                         </StackPanel>
                                     </StackPanel>
                                 </Grid>
@@ -241,11 +241,11 @@
                                     <StackPanel Grid.Column="2">
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label x:Name="ffdf" Content="Minimum score allowed:" />
-                                            <TextBox x:Name="minScoreAllowed" PreviewTextInput="CheckIfNumber" Width="45" />
+                                            <local:IntegerTexBoxControl x:Name="minScoreAllowed" Width="45" />
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Margin="5">
                                             <Label Content="Max Threads" />
-                                            <TextBox x:Name="maxThreadsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
+                                            <local:IntegerTexBoxControl x:Name="maxThreadsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
                                                 <TextBox.ToolTip>
                                                     <TextBlock>
                                                         By default, MetaMorpheus uses this machine's number of threads minus one to maximize search speed while letting you use your computer for other purposes.
@@ -253,7 +253,7 @@
                                                         Enter a lower number to limit CPU usage.
                                                     </TextBlock>
                                                 </TextBox.ToolTip>
-                                            </TextBox>
+                                            </local:IntegerTexBoxControl>
                                         </StackPanel>
                                     </StackPanel>
                                 </Grid>
diff --git a/MetaMorpheus/GUI/TaskWindows/XLSearchTaskWindow.xaml.cs b/MetaMorpheus/GUI/TaskWindows/XLSearchTaskWindow.xaml.cs
index 477d53d2f..42eac5f43 100644
--- a/MetaMorpheus/GUI/TaskWindows/XLSearchTaskWindow.xaml.cs
+++ b/MetaMorpheus/GUI/TaskWindows/XLSearchTaskWindow.xaml.cs
@@ -54,11 +54,6 @@ public XLSearchTaskWindow(XLSearchTask task)
 
         internal XLSearchTask TheTask { get; private set; }
 
-        private void CheckIfNumber(object sender, TextCompositionEventArgs e)
-        {
-            e.Handled = GlobalGuiSettings.CheckIsPositiveInteger(e.Text);
-        }
-
         private void PopulateChoices()
         {
             foreach (var crosslinker in GlobalVariables.Crosslinkers)
diff --git a/MetaMorpheus/GUI/Util/DoubleTexBoxControl.cs b/MetaMorpheus/GUI/Util/DoubleTexBoxControl.cs
index c26bbd9f8..633b3d4b4 100644
--- a/MetaMorpheus/GUI/Util/DoubleTexBoxControl.cs
+++ b/MetaMorpheus/GUI/Util/DoubleTexBoxControl.cs
@@ -1,4 +1,5 @@
-using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace MetaMorpheusGUI
@@ -8,6 +9,12 @@ namespace MetaMorpheusGUI
     /// </summary>
     public class DoubleTextBoxControl : TextBox
     {
+        public DoubleTextBoxControl()
+        {
+            HorizontalContentAlignment = HorizontalAlignment.Center;
+            VerticalContentAlignment = VerticalAlignment.Center;
+        }
+
         protected override void OnPreviewTextInput(TextCompositionEventArgs e)
         {
             foreach (var character in e.Text)
@@ -26,5 +33,16 @@ protected override void OnPreviewTextInput(TextCompositionEventArgs e)
             }
             e.Handled = false;
         }
+
+        /// <summary>
+        /// Cursor is removed from text box on pressing Return
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (e.Key == Key.Return)
+                Keyboard.ClearFocus();
+        }
     }
 }
diff --git a/MetaMorpheus/GUI/Util/IntegerTextBoxControl.cs b/MetaMorpheus/GUI/Util/IntegerTextBoxControl.cs
index a3ec1c315..f0b59a44e 100644
--- a/MetaMorpheus/GUI/Util/IntegerTextBoxControl.cs
+++ b/MetaMorpheus/GUI/Util/IntegerTextBoxControl.cs
@@ -1,4 +1,5 @@
-using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace MetaMorpheusGUI
@@ -8,6 +9,16 @@ namespace MetaMorpheusGUI
     /// </summary>
     public class IntegerTexBoxControl : TextBox
     {
+        public IntegerTexBoxControl()
+        {
+            HorizontalContentAlignment = HorizontalAlignment.Center;
+            VerticalContentAlignment = VerticalAlignment.Center;
+        }
+
+        /// <summary>
+        /// Ensures only integers can be inputted into the text box
+        /// </summary>
+        /// <param name="e"></param>
         protected override void OnPreviewTextInput(TextCompositionEventArgs e)
         {
             foreach (var character in e.Text)
@@ -20,5 +31,16 @@ protected override void OnPreviewTextInput(TextCompositionEventArgs e)
             }
             e.Handled = false;
         }
+
+        /// <summary>
+        /// Cursor is removed from text box on pressing Return
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (e.Key == Key.Return)
+                Keyboard.ClearFocus();
+        }
     }
 }
diff --git a/MetaMorpheus/GUI/Views/FileSpecificParametersWindow.xaml b/MetaMorpheus/GUI/Views/FileSpecificParametersWindow.xaml
index 43b038c9a..f07125e38 100644
--- a/MetaMorpheus/GUI/Views/FileSpecificParametersWindow.xaml
+++ b/MetaMorpheus/GUI/Views/FileSpecificParametersWindow.xaml
@@ -23,7 +23,7 @@
                         </ToolTipService.ToolTip>
                     </CheckBox>
                     <Label Content="Precursor Mass Tolerance" Width="150" Margin="20,0,0,0" IsEnabled="{Binding IsChecked, ElementName=fileSpecificPrecursorMassTolEnabled}" />
-                    <TextBox x:Name="precursorMassToleranceTextBox" PreviewTextInput="CheckIfNumber" Height="26" Width="45" HorizontalAlignment="Left" TextWrapping="Wrap" IsEnabled="{Binding IsChecked, ElementName=fileSpecificPrecursorMassTolEnabled}" />
+                    <local:DoubleTextBoxControl x:Name="precursorMassToleranceTextBox" Height="26" Width="45" HorizontalAlignment="Left" TextWrapping="Wrap" IsEnabled="{Binding IsChecked, ElementName=fileSpecificPrecursorMassTolEnabled}" />
                     <ComboBox x:Name="precursorMassToleranceComboBox" Height="26" HorizontalAlignment="Left" IsEnabled="{Binding IsChecked, ElementName=fileSpecificPrecursorMassTolEnabled}"  />
                 </StackPanel>
                 <!-- File-specific Product Tolerance -->
@@ -34,7 +34,7 @@
                         </ToolTipService.ToolTip>
                     </CheckBox>
                     <Label Content="Product Mass Tolerance" Width="150"  Margin="20,0,0,0" IsEnabled="{Binding IsChecked, ElementName=fileSpecificProductMassTolEnabled}"  />
-                    <TextBox x:Name="productMassToleranceTextBox" PreviewTextInput="CheckIfNumber" HorizontalAlignment="Left" TextWrapping="Wrap" Width="45" IsEnabled="{Binding IsChecked, ElementName=fileSpecificProductMassTolEnabled}" />
+                    <local:DoubleTextBoxControl x:Name="productMassToleranceTextBox" HorizontalAlignment="Left" TextWrapping="Wrap" Width="45" IsEnabled="{Binding IsChecked, ElementName=fileSpecificProductMassTolEnabled}" />
                     <ComboBox x:Name="productMassToleranceComboBox" HorizontalAlignment="Left" IsEnabled="{Binding IsChecked, ElementName=fileSpecificProductMassTolEnabled}"  />
                 </StackPanel>
                 <!-- File-specific Protease -->
@@ -55,7 +55,7 @@
                         </ToolTipService.ToolTip>
                     </CheckBox>
                     <Label x:Name="lblMinPeptideLength" Margin="20,0,0,0" Width="100" Content="Min Peptide Len" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMinPeptideLengthEnabled}" />
-                    <TextBox x:Name="MinPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMinPeptideLengthEnabled}" />
+                    <local:IntegerTexBoxControl x:Name="MinPeptideLengthTextBox" Width="45" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMinPeptideLengthEnabled}" />
                 </StackPanel>
                 <!-- File-specific Max Peptide Length -->
                 <StackPanel Orientation="Horizontal" Margin="10,0,0,8">
@@ -65,7 +65,7 @@
                         </ToolTipService.ToolTip>
                     </CheckBox>
                     <Label x:Name="lblMaxPeptideLength" Margin="20,0,0,0" Width="100"  Content="Max Peptide Len" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMaxPeptideLengthEnabled}" />
-                    <TextBox x:Name="MaxPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMaxPeptideLengthEnabled}" />
+                    <local:IntegerTexBoxControl x:Name="MaxPeptideLengthTextBox" Width="45" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMaxPeptideLengthEnabled}" />
                 </StackPanel>
                 <!-- File-specific Max Missed Cleavages -->
                 <StackPanel Orientation="Horizontal" Margin="10,0,0,8">
@@ -75,7 +75,7 @@
                         </ToolTipService.ToolTip>
                     </CheckBox>
                     <Label x:Name="maxMissedCleavagesLabel" Margin="20,0,0,0" Width="130" Content="Max Missed Cleavages" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMissedCleavagesEnabled}"  />
-                    <TextBox x:Name="missedCleavagesTextBox" PreviewTextInput="CheckIfNumber" Width="45" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMissedCleavagesEnabled}" />
+                    <local:IntegerTexBoxControl x:Name="missedCleavagesTextBox" Width="45" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMissedCleavagesEnabled}" />
                 </StackPanel>
                 <!-- File-specific Max Mods per Peptide -->
                 <StackPanel Orientation="Horizontal" Margin="10,0,0,8">
@@ -85,7 +85,7 @@
                         </ToolTipService.ToolTip>
                     </CheckBox>
                     <Label x:Name="lbMaxModNum" Margin="20,0,0,0" Width="130" Content="Max mods per peptide" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMaxModNumEnabled}" />
-                    <TextBox x:Name="MaxModNumTextBox" PreviewTextInput="CheckIfNumber" Width="45" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMaxModNumEnabled}" />
+                    <local:IntegerTexBoxControl x:Name="MaxModNumTextBox" Width="45" IsEnabled="{Binding IsChecked, ElementName=fileSpecificMaxModNumEnabled}" />
                 </StackPanel>
                 <!-- File-specific Dissociation Type -->
                 <StackPanel Orientation="Horizontal" Margin="10,0,0,8">
diff --git a/MetaMorpheus/GUI/Views/FileSpecificParametersWindow.xaml.cs b/MetaMorpheus/GUI/Views/FileSpecificParametersWindow.xaml.cs
index 02494f1da..246f622a4 100644
--- a/MetaMorpheus/GUI/Views/FileSpecificParametersWindow.xaml.cs
+++ b/MetaMorpheus/GUI/Views/FileSpecificParametersWindow.xaml.cs
@@ -326,11 +326,6 @@ private void PopulateChoices()
             }
         }
 
-        private void CheckIfNumber(object sender, TextCompositionEventArgs e)
-        {
-            e.Handled = GlobalGuiSettings.CheckIsPositiveInteger(e.Text);
-        }
-
         private void KeyPressed(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Return)