diff --git a/Build.PL b/Build.PL
index 13cece256..5b87d2999 100644
--- a/Build.PL
+++ b/Build.PL
@@ -27,7 +27,9 @@ my %recommends = qw(
     Growl::GNTP                     0.15
     XML::SAX::ExpatXS               0
 );
-if (defined $ARGV[0] && $ARGV[0] eq '--gui') {
+
+my $gui = defined $ARGV[0] && $ARGV[0] eq '--gui';
+if ($gui) {
     %prereqs = qw(
     Wx                              0.9918
     );
@@ -106,22 +108,24 @@ EOF
         }
     }
     
-    # temporarily require this dev version until this upstream bug
-    # is resolved: https://rt.cpan.org/Ticket/Display.html?id=86367
-    system $cpanm, 'SMUELLER/ExtUtils-ParseXS-3.18_04.tar.gz';
-    
-    # clean xs directory before reinstalling, to make sure Build is called
-    # with current perl binary
-    if (-e './xs/Build') {
-        if ($^O eq 'MSWin32') {
-            system 'cd', 'xs';
-            system 'Build', 'distclean';
-            system 'cd', '..';
-        } else {
-            system './xs/Build', 'distclean';
+    if (!$gui) {
+        # temporarily require this dev version until this upstream bug
+        # is resolved: https://rt.cpan.org/Ticket/Display.html?id=86367
+        system $cpanm, 'SMUELLER/ExtUtils-ParseXS-3.18_04.tar.gz';
+        
+        # clean xs directory before reinstalling, to make sure Build is called
+        # with current perl binary
+        if (-e './xs/Build') {
+            if ($^O eq 'MSWin32') {
+                system 'cd', 'xs';
+                system 'Build', 'distclean';
+                system 'cd', '..';
+            } else {
+                system './xs/Build', 'distclean';
+            }
         }
+        system $cpanm, '--reinstall', './xs';
     }
-    system $cpanm, '--reinstall', './xs';
 }
 
 if ($missing_prereqs) {
@@ -130,7 +134,7 @@ if ($missing_prereqs) {
     if (eval "use App::Prove; 1") {
         App::Prove->new->run;
     }
-    if (!defined $ARGV[0] || $ARGV[0] ne '--gui') {
+    if (!$gui) {
         print "If you also want to use the GUI you can now run `perl Build.PL --gui` to install the required modules.\n";
     }
 }