diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java
index d3de20f0..78939667 100644
--- a/plugins/HoloScan.java
+++ b/plugins/HoloScan.java
@@ -26,8 +26,8 @@ public class HoloScan extends Panel {
         
         //Component persistence
         ArrayList<Component> persistedComponents = new ArrayList<>();        
-        persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, JSpinner.class)));
         persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, JToggleButton.class)));
+        persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, JSpinner.class)));        
         setPersistedComponents(persistedComponents.toArray(new Component[0]));
     }
         
diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java
index 434ae0e3..a7dc578e 100644
--- a/plugins/ManipulatorScan.java
+++ b/plugins/ManipulatorScan.java
@@ -26,8 +26,8 @@ public class ManipulatorScan extends Panel {
         
         //Component persistence
         ArrayList<Component> persistedComponents = new ArrayList<>();        
-        persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, JSpinner.class)));
         persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, JToggleButton.class)));
+        persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, JSpinner.class)));        
         setPersistedComponents(persistedComponents.toArray(new Component[0]));
         
     }
diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java
index f9e67952..d3aacbff 100644
--- a/plugins/PhotonEnergy.java
+++ b/plugins/PhotonEnergy.java
@@ -27,8 +27,8 @@ public class PhotonEnergy extends Panel {
         
         //Component persistence
         ArrayList<Component> persistedComponents = new ArrayList<>();
-        persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, JSpinner.class)));
         persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, JToggleButton.class)));
+        persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, JSpinner.class)));        
         setPersistedComponents(persistedComponents.toArray(new Component[0]));
         
     }
diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java
index d8a3ae4e..0e2df6b6 100644
--- a/plugins/XPSSpectrum.java
+++ b/plugins/XPSSpectrum.java
@@ -72,8 +72,8 @@ public class XPSSpectrum extends Panel {
 
         //Component persistence
         ArrayList<Component> persistedComponents = new ArrayList<>();
-        persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, ValueSelection.class)));
         persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, JToggleButton.class)));
+        persistedComponents.addAll(Arrays.asList(SwingUtils.getComponentsByType(this, ValueSelection.class)));        
         setPersistedComponents(persistedComponents.toArray(new Component[0]));        
     }