diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 030922520264f0..d3f79f726eab55 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -152,7 +152,7 @@ export function submitCompose(routerHistory) {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
       },
     }).then(function (response) {
-      if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
+      if (response.data.visibility === 'direct' && !response.data.limited && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
         routerHistory.push('/timelines/direct');
       } else if (routerHistory && routerHistory.location.pathname === '/statuses/new' && window.history.state) {
         routerHistory.goBack();
diff --git a/app/javascript/mastodon/containers/compose_container.js b/app/javascript/mastodon/containers/compose_container.js
index 7bc7bbaa4dc29d..01cf1974585bb2 100644
--- a/app/javascript/mastodon/containers/compose_container.js
+++ b/app/javascript/mastodon/containers/compose_container.js
@@ -8,6 +8,7 @@ import { getLocale } from '../locales';
 import Compose from '../features/standalone/compose';
 import initialState from '../initial_state';
 import { fetchCustomEmojis } from '../actions/custom_emojis';
+import { fetchCircles } from '../actions/circles';
 
 const { localeData, messages } = getLocale();
 addLocaleData(localeData);
@@ -19,6 +20,7 @@ if (initialState) {
 }
 
 store.dispatch(fetchCustomEmojis());
+store.dispatch(fetchCircles());
 
 export default class TimelineContainer extends React.PureComponent {
 
diff --git a/app/javascript/mastodon/features/circles/components/circle.js b/app/javascript/mastodon/features/circles/components/circle.js
index 3766eac25b6f4a..a7f4d32b6929d7 100644
--- a/app/javascript/mastodon/features/circles/components/circle.js
+++ b/app/javascript/mastodon/features/circles/components/circle.js
@@ -3,10 +3,8 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
 import Icon from '../../../components/icon';
-import IconButton from '../../../components/icon_button';
 import { openModal } from '../../../actions/modal';
 import { deleteCircle } from '../../../actions/circles';
-import { defaultMediaVisibility } from '../../../components/status';
 
 const messages = defineMessages({
   deleteTitle: { id: 'confirmations.delete_circle.title', defaultMessage: 'Delete' },
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c1558aaa048759..356af606b29db2 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6343,6 +6343,7 @@ noscript {
     background: lighten($ui-base-color, 8%);
     color: $primary-text-color;
     padding: 15px;
+    margin: 0;
     font-size: 16px;
     text-align: left;
     text-decoration: none;
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index fbf26e30bc0290..e0b4a6f4937d28 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -416,4 +416,9 @@ body.rtl {
     left: auto;
     right: 0;
   }
+
+  .circle-link .circle-edit-button,
+  .circle-link .circle-delete-button {
+      text-align: right;
+  }
 }
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 9259e6b47e670c..b9ebd034d977c5 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -37,7 +37,12 @@ def exact_match
       end
     end
 
-    match = nil if !match.nil? && !account.nil? && options[:following] && !account.following?(match)
+    @exact_match = nil
+
+    unless match.nil? || account.nil?
+      return if options[:following] && !account.following?(match)
+      return if options[:followers] && !match.following?(account)
+    end
 
     @exact_match = match
   end