diff --git a/src/object/brain.cpp b/src/object/brain.cpp
index 1f428b74..53f77cf1 100644
--- a/src/object/brain.cpp
+++ b/src/object/brain.cpp
@@ -1288,7 +1288,7 @@ bool CBrain::CreateInterface(bool bSelect)
          type == OBJECT_BEE      ||
          type == OBJECT_WORM     )  // vehicle?
     {
-        if (!(CRobotMain::GetInstancePointer()->GetRetroMode())) {
+        if (!(m_main->GetRetroMode())) {
             ddim.x = dim.x*5.1f;
             ddim.y = dim.y*2.0f;
             pos.x = ox+sx*0.0f;
diff --git a/src/object/object.cpp b/src/object/object.cpp
index d6ac6819..a0a3f097 100644
--- a/src/object/object.cpp
+++ b/src/object/object.cpp
@@ -6980,7 +6980,7 @@ void CObject::CreateSelectParticle()
         }
     }
 
-    if ( m_bSelect || IsProgram() )
+    if ( m_bSelect || IsProgram() || m_main->GetRetroMode() )
     {
         // Creates particles lens for the headlights.
         if ( m_type == OBJECT_MOBILEfa ||
@@ -7034,7 +7034,7 @@ void CObject::UpdateSelectParticle()
     float       angle;
     int         i;
 
-    if ( !m_bSelect && !IsProgram() )  return;
+    if ( !m_bSelect && !IsProgram() && !m_main->GetRetroMode() )  return;
 
     dim[0].x = 1.0f;
     dim[1].x = 1.0f;
@@ -7157,7 +7157,8 @@ void CObject::UpdateSelectParticle()
     zoom[2] = 1.0f;
     zoom[3] = 1.0f;
 
-    if ( IsProgram() &&  // current program?
+    if ( ( IsProgram() ||  // current program?
+         m_main->GetRetroMode() ) && // Retro mode?
          Math::Mod(m_aTime, 0.7f) < 0.3f )
     {
         zoom[0] = 0.0f;  // blinks