diff --git a/gui/dialogs/property-browser.xml b/gui/dialogs/property-browser.xml
index 92153e9c5..964593173 100644
--- a/gui/dialogs/property-browser.xml
+++ b/gui/dialogs/property-browser.xml
@@ -175,8 +175,7 @@
 			var clone = func(startdir) {
 				var base = props.globals.getNode("/sim/gui/dialogs", 1);
 				var name = "property-browser-";
-				var i = nil;
-				for (i = 1; 1; i += 1)
+				for (var i = 1; 1; i += 1)
 					if (base.getNode(name ~ i, 0) == nil)
 						break;
 				base = base.getNode(name ~ i, 1).getPath();
diff --git a/gui/dialogs/weather_scenario.xml b/gui/dialogs/weather_scenario.xml
index bb9738a3d..ee5efa158 100644
--- a/gui/dialogs/weather_scenario.xml
+++ b/gui/dialogs/weather_scenario.xml
@@ -28,15 +28,6 @@
       <value>Thunderstorm</value>
       <value>METAR</value>
       <value>none</value>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-      <binding>
-        <command>nasal</command>
-        <script>
-          setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers")+1);
-        </script>
-      </binding>
     </combo>
   </group>
 
@@ -58,15 +49,30 @@
 
   <group>
     <layout>hbox</layout>
+
     <empty><stretch>true</stretch></empty>
 
+    <button>
+        <legend>OK</legend>
+        <default>true</default>
+        <binding>
+            <command>dialog-apply</command>
+        </binding>
+        <binding>
+            <command>dialog-close</command>
+        </binding>
+    </button>
+
+    <button>
+        <legend>Apply</legend>
+        <binding>
+            <command>dialog-apply</command>
+        </binding>
+    </button>
+
     <button>
       <legend>Close</legend>
-      <default>true</default>
       <key>Esc</key>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
       <binding>
         <command>dialog-close</command>
       </binding>