diff --git a/Ample/Base.lproj/LaunchWindow.xib b/Ample/Base.lproj/LaunchWindow.xib
index d4a0bcf..2b1fedc 100644
--- a/Ample/Base.lproj/LaunchWindow.xib
+++ b/Ample/Base.lproj/LaunchWindow.xib
@@ -489,6 +489,11 @@ DQ
                         </searchFieldCell>
                         <connections>
                             <action selector="softwareChanged:" target="-2" id="879-da-UEc"/>
+                            <binding destination="-2" name="hidden" keyPath="machine" id="RdE-9k-oFd">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">NSIsNil</string>
+                                </dictionary>
+                            </binding>
                         </connections>
                     </searchField>
                     <customView id="oVt-eD-aaj" customClass="FlippedView">
diff --git a/Ample/LaunchWindowController.m b/Ample/LaunchWindowController.m
index 43dd318..f9e1d94 100644
--- a/Ample/LaunchWindowController.m
+++ b/Ample/LaunchWindowController.m
@@ -162,6 +162,8 @@ static int EffectsIndex(NSString *str) {
     [self setMameShareDirectory: NO];
 
     [self setSoftware: nil];
+    _softwareSet = nil;
+    [_softwareListControl setObjectValue: nil];
 }
 
 -(void)windowWillLoad {
@@ -681,6 +683,7 @@ static NSString *ShellQuote(NSString *s) {
     NSDictionary *d = [bm loadDefault];
     if (!d) {
         [self reset: sender];
+        [_slotController setMachine: nil];
         return;
     }
     [self loadBookmark: d];