diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index 060e5e737..e437635fd 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -75,8 +75,9 @@ ChatForm::ChatForm(Friend* chatFriend)
     connect(volButton, SIGNAL(clicked()), this, SLOT(onVolMuteToggle()));
     connect(Core::getInstance(), &Core::fileSendFailed, this, &ChatForm::onFileSendFailed);
     connect(this, SIGNAL(chatAreaCleared()), this, SLOT(clearReciepts()));
-    connect(nameLabel, &CroppingLabel::textChanged, this, [=](QString text, QString orig)
-        {if (text != orig) emit aliasChanged(text);} );
+    connect(nameLabel, &CroppingLabel::textChanged, this, [=](QString text, QString orig) {
+        if (text != orig) emit aliasChanged(text);
+    } );
 
     setAcceptDrops(true);
 }
diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
index 8fc54c439..8612b5c0e 100644
--- a/src/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -145,10 +145,8 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
 
     connect(emoteButton,  SIGNAL(clicked()), this, SLOT(onEmoteButtonClicked()));
     connect(chatWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
-    connect(chatWidget, SIGNAL(onClick()), this, SLOT(onChatWidgetClicked()));
 
-    //chatWidget->document()->setDefaultStyleSheet(Style::getStylesheet(":ui/chatArea/innerStyle.css"));
-    //chatWidget->setStyleSheet(Style::getStylesheet(":/ui/chatArea/chatArea.css"));
+    chatWidget->setStyleSheet(Style::getStylesheet(":/ui/chatArea/chatArea.css"));
     headWidget->setStyleSheet(Style::getStylesheet(":/ui/chatArea/chatHead.css"));
 
     //ChatAction::setupFormat();
@@ -235,11 +233,6 @@ void GenericChatForm::onEmoteButtonClicked()
     }
 }
 
-void GenericChatForm::onChatWidgetClicked()
-{
-    msgEdit->setFocus();
-}
-
 void GenericChatForm::onEmoteInsertRequested(QString str)
 {
     // insert the emoticon
diff --git a/src/widget/form/genericchatform.h b/src/widget/form/genericchatform.h
index 37a63faee..a14e480d9 100644
--- a/src/widget/form/genericchatform.h
+++ b/src/widget/form/genericchatform.h
@@ -72,7 +72,6 @@ protected slots:
     void onEmoteButtonClicked();
     void onEmoteInsertRequested(QString str);
     void clearChatArea(bool);
-    void onChatWidgetClicked();
 
 protected:
     QString resolveToxID(const ToxID &id);
diff --git a/ui/chatArea/chatArea.css b/ui/chatArea/chatArea.css
index 9608af802..98530a142 100644
--- a/ui/chatArea/chatArea.css
+++ b/ui/chatArea/chatArea.css
@@ -4,7 +4,7 @@ QTextEdit
     color: back;
 }
 
-QTextBrowser
+QGraphicsView 
 {
-	border: none;
+    border: none;
 }