diff --git a/Changelog.md b/Changelog.md
index 27a231d45..ca13c4a39 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -15,6 +15,7 @@
 * Fit pod name to page size on the sign in page [#5056](https://github.com/diaspora/diaspora/pull/5056)
 * Set mention notification as read when viewing post [#5006](https://github.com/diaspora/diaspora/pull/5006)
 * Set sharing notification as read when viewing profile [#5009](https://github.com/diaspora/diaspora/pull/5009)
+* Ensure a consistent border on text input elements [#5069](https://github.com/diaspora/diaspora/pull/5069)
 
 ## Features
 * Port admin pages to bootstrap, polish user search results, allow accounts to be closed from the backend [#5046](https://github.com/diaspora/diaspora/pull/5046)
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 36243e1ce..8c0925125 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -19,6 +19,7 @@
 @import 'popover'
 @import 'stream_element'
 @import 'report'
+@import 'new_styles/_forms'
 
 /* ====== media ====== */
 .media
diff --git a/app/assets/stylesheets/new_styles/_forms.scss b/app/assets/stylesheets/new_styles/_forms.scss
index 9586da874..c1aa97c4b 100644
--- a/app/assets/stylesheets/new_styles/_forms.scss
+++ b/app/assets/stylesheets/new_styles/_forms.scss
@@ -86,6 +86,14 @@ form.block-form {
   }
 }
 
+textarea, input[type=text] {
+  &:focus {
+    border: 1px solid $border-dark-grey;
+    outline: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    }
+  }
 
 /* buttons to be extracted? */
 .new-btn {