diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 3375dc4d9..2a27bb7cf 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -216,14 +216,18 @@ void ModulePanel::update()
     ui->label_failsafeMode->setVisible(mask & MASK_FAILSAFES);
     ui->failsafeMode->setVisible(mask & MASK_FAILSAFES);
     ui->failsafeMode->setCurrentIndex(module.failsafeMode);
-    ui->label_failsafeFrame->setVisible(mask & MASK_FAILSAFES);
-    ui->failsafesFrame->setVisible(mask & MASK_FAILSAFES);
     ui->failsafesFrame->setEnabled(module.failsafeMode == 1);
     for (int i=0; i<failsafeSliders.size(); i++) {
       failsafeSliders[i]->setValue(module.failsafeChannels[i]);
       failsafeSpins[i]->setValue(module.failsafeChannels[i]);
     }
   }
+  else {
+    mask = 0;
+  }
+  
+  ui->failsafesLayoutLabel->setVisible(mask & MASK_FAILSAFES);
+  ui->failsafesFrame->setVisible(mask & MASK_FAILSAFES);
 }
 
 void ModulePanel::on_trainerMode_currentIndexChanged(int index)
diff --git a/companion/src/modeledit/setup_module.ui b/companion/src/modeledit/setup_module.ui
index 500ea2fe8..406488f96 100644
--- a/companion/src/modeledit/setup_module.ui
+++ b/companion/src/modeledit/setup_module.ui
@@ -443,7 +443,7 @@
        </widget>
       </item>
       <item row="7" column="0" alignment="Qt::AlignRight">
-       <widget class="QLabel" name="label_failsafeFrame">
+       <widget class="QLabel" name="failsafesLayoutLabel">
         <property name="maximumSize">
          <size>
           <width>16777215</width>