diff --git a/certy.ps1 b/certy.ps1
index 374c0f5..a506ee2 100644
--- a/certy.ps1
+++ b/certy.ps1
@@ -817,9 +817,7 @@ $y += $rowHeight + $gap
 $pfxPasswordLabel = Add-Label "PFX password" $xLabel $y $labelWidth $rowHeight
 $pfxPasswordBox = Add-TextBox $xInput $y $inputWidth $rowHeight $false
 $pfxPasswordBox.UseSystemPasswordChar = $true
-$y += $rowHeight + $gap
-
-$pfxPasswordToggle = Add-CheckBox "Use PFX password" $xInput $y 180 $rowHeight
+$pfxPasswordToggle = Add-CheckBox "Use PFX password" ($xInput + $inputWidth - 180) $y 180 $rowHeight
 $pfxPasswordToggle.Checked = $true
 $y += $rowHeight + $gap
 
@@ -1163,8 +1161,8 @@ function Apply-Layout {
     $wacsPathBox.Width = $inputWidthCalc
     $outputTypeBox.Width = $inputWidthCalc
     $outputPathBox.Width = $inputWidthCalc
-    $pfxPasswordBox.Width = $inputWidthCalc
-    $pfxPasswordToggle.Width = $inputWidthCalc
+    $pfxPasswordToggle.Left = $xInput + $inputWidthCalc - $pfxPasswordToggle.Width
+    $pfxPasswordBox.Width = $inputWidthCalc - ($pfxPasswordToggle.Width + $buttonGap)
     $baseUriBox.Width = $inputWidthCalc
     $validationBox.Width = $inputWidthCalc
     $validationPortBox.Width = $inputWidthCalc