diff --git a/include/lobby.h b/include/lobby.h
index 8083249..61c93c5 100644
--- a/include/lobby.h
+++ b/include/lobby.h
@@ -78,9 +78,6 @@ private:
 
   AOTextArea *ui_chatbox;
 
-  QLineEdit *ui_chatname;
-  QLineEdit *ui_chatmessage;
-
   AOImage *ui_loading_background;
   QTextEdit *ui_loading_text;
   QProgressBar *ui_progress_bar;
@@ -105,7 +102,6 @@ private slots:
   void on_server_list_clicked(QTreeWidgetItem *p_item, int column);
   void on_server_list_doubleclicked(QTreeWidgetItem *p_item, int column);
   void on_server_search_edited(QString p_text);
-  void on_chatfield_return_pressed();
 };
 
 #endif // LOBBY_H
diff --git a/src/lobby.cpp b/src/lobby.cpp
index 4449603..b3371e6 100644
--- a/src/lobby.cpp
+++ b/src/lobby.cpp
@@ -59,12 +59,6 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
   ui_chatbox = new AOTextArea(this);
   ui_chatbox->setOpenExternalLinks(true);
   ui_chatbox->setObjectName("ui_chatbox");
-  ui_chatname = new QLineEdit(this);
-  ui_chatname->setPlaceholderText(tr("Name"));
-  ui_chatname->setText(ao_app->get_ooc_name());
-  ui_chatname->setObjectName("ui_chatname");
-  ui_chatmessage = new QLineEdit(this);
-  ui_chatmessage->setObjectName("ui_chatmessage");
   ui_loading_background = new AOImage(this, ao_app);
   ui_loading_background->setObjectName("ui_loading_background");
   ui_loading_text = new QTextEdit(ui_loading_background);
@@ -95,8 +89,6 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
           this, &Lobby::on_server_list_doubleclicked);
   connect(ui_server_search, &QLineEdit::textChanged, this,
           &Lobby::on_server_search_edited);
-  connect(ui_chatmessage, &QLineEdit::returnPressed, this,
-          &Lobby::on_chatfield_return_pressed);
   connect(ui_cancel, &AOButton::clicked, ao_app, &AOApplication::loading_cancelled);
 
   ui_connect->setEnabled(false);
@@ -175,10 +167,6 @@ void Lobby::set_widgets()
   set_size_and_pos(ui_chatbox, "chatbox");
   ui_chatbox->setReadOnly(true);
 
-  set_size_and_pos(ui_chatname, "chatname");
-
-  set_size_and_pos(ui_chatmessage, "chatmessage");
-
   ui_loading_background->resize(this->width(), this->height());
   ui_loading_background->set_image("loadingbackground");
 
@@ -221,8 +209,6 @@ void Lobby::set_fonts()
   set_font(ui_player_count, "player_count");
   set_font(ui_description, "description");
   set_font(ui_chatbox, "chatbox");
-  set_font(ui_chatname, "chatname");
-  set_font(ui_chatmessage, "chatmessage");
   set_font(ui_loading_text, "loading_text");
   set_font(ui_server_list, "server_list");
 }
@@ -496,15 +482,6 @@ void Lobby::on_server_search_edited(QString p_text)
   }
 }
 
-void Lobby::on_chatfield_return_pressed()
-{
-  // no you can't send empty messages
-  if (ui_chatname->text() == "" || ui_chatmessage->text() == "")
-    return;
-
-  ui_chatmessage->clear();
-}
-
 void Lobby::list_servers()
 {
   public_servers_selected = true;