diff --git a/src/states_screens/dialogs/notification_dialog.cpp b/src/states_screens/dialogs/notification_dialog.cpp
index 7e823dfde..298e89cda 100644
--- a/src/states_screens/dialogs/notification_dialog.cpp
+++ b/src/states_screens/dialogs/notification_dialog.cpp
@@ -124,7 +124,7 @@ bool NotificationDialog::onEscapePressed()
 void NotificationDialog::onUpdate(float dt)
 {
     //If we want to open the registration dialog, we need to close this one first
-    m_view && (m_self_destroy = true);
+    if (m_view) m_self_destroy = true;
 
     // It's unsafe to delete from inside the event handler so we do it here
     if (m_self_destroy)
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 6d8c49123..124f99b25 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -160,7 +160,7 @@ void ServerInfoDialog::onUpdate(float dt)
     }
 
     //If we want to open the registration dialog, we need to close this one first
-    m_enter_lobby && (m_self_destroy = true);
+    if (m_enter_lobby) m_self_destroy = true;
 
     // It's unsafe to delete from inside the event handler so we do it here
     if (m_self_destroy)
diff --git a/src/states_screens/dialogs/user_info_dialog.cpp b/src/states_screens/dialogs/user_info_dialog.cpp
index 77cada7dd..3c42aa80a 100644
--- a/src/states_screens/dialogs/user_info_dialog.cpp
+++ b/src/states_screens/dialogs/user_info_dialog.cpp
@@ -216,7 +216,7 @@ void UserInfoDialog::onUpdate(float dt)
     if(m_processing) m_info_widget->setText(Messages::processing(), false);
 
     //If we want to open the registration dialog, we need to close this one first
-    m_enter_profile && (m_self_destroy = true);
+    if (m_enter_profile) m_self_destroy = true;
 
     // It's unsafe to delete from inside the event handler so we do it here
     if (m_self_destroy)