diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61361467..3c1f7254 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@
 ### Minor changes and fixes
 
 * Fix #311:
-  * Fix inconsistency between browsers on textarea outlines
+  * Fix inconsistency between browsers on textarea outlines.
+  * Fix ConverseJS input borders/outline/shadow.
 
 ## 8.1.0
 
diff --git a/conversejs/custom/shared/styles/_peertubetheme.scss b/conversejs/custom/shared/styles/_peertubetheme.scss
index f8382e67..6fabbc9b 100644
--- a/conversejs/custom/shared/styles/_peertubetheme.scss
+++ b/conversejs/custom/shared/styles/_peertubetheme.scss
@@ -85,6 +85,18 @@
     }
   }
 
+  .form-control {
+    /* Cancelling some bootstrap stuff */
+    border-color: var(--chatroom-head-bg-color);
+    box-shadow: none;
+
+    &:focus {
+      border-color: var(--chatroom-head-bg-color);
+      outline: 2px solid var(--chatroom-head-bg-color);
+      box-shadow: none;
+    }
+  }
+
   .chatroom .box-flyout .chatroom-body .chatroom-form-container {
     background-color: var(--peertube-main-background);
   }