diff --git a/src/ui/check.cpp b/src/ui/check.cpp
index e590309f..53421e74 100644
--- a/src/ui/check.cpp
+++ b/src/ui/check.cpp
@@ -150,8 +150,6 @@ void CCheck::Draw()
 
     m_dim = iDim;
 
-    if ( m_state & STATE_DEAD )  return;
-
     // Draw the name.
     pos.x = m_pos.x + m_dim.y / 0.9f;
     pos.y = m_pos.y + m_dim.y * 0.50f;
@@ -160,4 +158,3 @@ void CCheck::Draw()
 }
 
 }
-
diff --git a/src/ui/editvalue.cpp b/src/ui/editvalue.cpp
index 47440297..b5fde44e 100644
--- a/src/ui/editvalue.cpp
+++ b/src/ui/editvalue.cpp
@@ -148,6 +148,7 @@ bool CEditValue::EventProcess(const Event &event)
 
     if ( (m_state & STATE_VISIBLE) == 0 )  return true;
     if ( (m_state & STATE_ENABLE) == 0 )  return true;
+    if ( m_state & STATE_DEAD )  return true;
 
     if ( m_edit != 0 )
     {
@@ -258,10 +259,12 @@ void CEditValue::Draw()
     }
     if ( m_buttonUp != 0 )
     {
+        m_buttonUp->SetState(STATE_DEAD, TestState(STATE_DEAD));
         m_buttonUp->Draw();
     }
     if ( m_buttonDown != 0 )
     {
+        m_buttonDown->SetState(STATE_DEAD, TestState(STATE_DEAD));
         m_buttonDown->Draw();
     }
 }
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index 77e57281..ceabe45c 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -1074,10 +1074,11 @@ void CMainDialog::ChangePhase(Phase phase)
         pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_SHADOW);
         pc->SetState(STATE_SHADOW);
         pos.y -= 0.048f;
-        if ( !m_bSimulSetup )
+        pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_GROUND);
+        pc->SetState(STATE_SHADOW);
+        if ( m_bSimulSetup )
         {
-            pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_GROUND);
-            pc->SetState(STATE_SHADOW);
+            pc->SetState(STATE_DEAD);
         }
         pos.y -= 0.048f;
         pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_DIRTY);
@@ -1095,10 +1096,11 @@ void CMainDialog::ChangePhase(Phase phase)
         pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_FOG);
         pc->SetState(STATE_SHADOW);
         pos.y -= 0.048f;
-        if ( !m_bSimulSetup )
+        pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_LIGHT);
+        pc->SetState(STATE_SHADOW);
+        if ( m_bSimulSetup )
         {
-            pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_LIGHT);
-            pc->SetState(STATE_SHADOW);
+            pc->SetState(STATE_DEAD);
         }
 
         pos.x = ox+sx*3;
@@ -1165,23 +1167,24 @@ void CMainDialog::ChangePhase(Phase phase)
         pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL12, name);
         pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT);
 
-        if ( !m_bSimulSetup )
+        pos.x = ox+sx*8.5f;
+        pos.y = 0.47f;
+        ddim.x = dim.x*2.2f;
+        ddim.y = 18.0f/480.0f;
+        pv = pw->CreateEditValue(pos, ddim, 0, EVENT_INTERFACE_GADGET);
+        pv->SetState(STATE_SHADOW);
+        if ( m_bSimulSetup )
         {
-            pos.x = ox+sx*8.5f;
-            pos.y = 0.47f;
-            ddim.x = dim.x*2.2f;
-            ddim.y = 18.0f/480.0f;
-            pv = pw->CreateEditValue(pos, ddim, 0, EVENT_INTERFACE_GADGET);
-            pv->SetState(STATE_SHADOW);
-            pv->SetMinValue(0.0f);
-            pv->SetMaxValue(1.0f);
-            pos.x += 0.13f;
-            pos.y -= 0.015f;
-            ddim.x = 0.40f;
-            GetResource(RES_EVENT, EVENT_INTERFACE_GADGET, name);
-            pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL13, name);
-            pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT);
+            pv->SetState(STATE_DEAD);
         }
+        pv->SetMinValue(0.0f);
+        pv->SetMaxValue(1.0f);
+        pos.x += 0.13f;
+        pos.y -= 0.015f;
+        ddim.x = 0.40f;
+        GetResource(RES_EVENT, EVENT_INTERFACE_GADGET, name);
+        pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL13, name);
+        pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT);
 
         pos.x = ox+sx*8.5f;
         pos.y = 0.385f;
@@ -1332,10 +1335,11 @@ void CMainDialog::ChangePhase(Phase phase)
         pc->SetState(STATE_SHADOW);
         pos.y -= 0.048f;
         pos.y -= 0.048f;
-        if ( !m_bSimulSetup )
+        pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_EDITMODE);
+        pc->SetState(STATE_SHADOW);
+        if ( m_bSimulSetup )
         {
-            pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_EDITMODE);
-            pc->SetState(STATE_SHADOW);
+            pc->SetState(STATE_DEAD);
         }
         pos.y -= 0.048f;
         pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_EDITVALUE);