diff --git a/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.js b/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.js
index da7e10a..ca9ec91 100644
--- a/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.js
+++ b/assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.js
@@ -21,7 +21,8 @@ export default class SolvedStatusFilter extends Component {
 
     if (
       !helper.siteSettings.show_filter_by_solved_status ||
-      router.currentRouteName === "discovery.categories"
+      router.currentRouteName === "discovery.categories" ||
+      args.editingCategory
     ) {
       return false;
     } else if (helper.siteSettings.allow_solved_on_all_topics) {
diff --git a/assets/stylesheets/solutions.scss b/assets/stylesheets/solutions.scss
index c63e917..b6af371 100644
--- a/assets/stylesheets/solutions.scss
+++ b/assets/stylesheets/solutions.scss
@@ -3,6 +3,7 @@ $solved-color: green;
 .select-kit {
   &.solved-status-filter {
     min-width: auto;
+    margin-right: 0.5em;
     .select-kit-header {
       margin: 0;
     }