diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index ddd1f8cc98a..892da152b5f 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -36,10 +36,7 @@
     line-height: 35px;
     padding-top: 7px;
     padding-bottom: 7px;
-
-    .float-right {
-      height: 20px;
-    }
+    display: flex;
   }
 
   .editor-ref {
@@ -60,20 +57,18 @@
 
   .new-file-name {
     display: inline-block;
-    max-width: 450px;
+    max-width: 420px;
     float: left;
 
     @media(max-width: map-get($grid-breakpoints, lg)-1) {
-      width: 280px;
-    }
-
-    @media(max-width: map-get($grid-breakpoints, md)-1) {
       width: 180px;
     }
   }
 
   .file-buttons {
-    font-size: 0;
+    display: flex;
+    flex: 1;
+    justify-content: flex-end;
   }
 
   .select2 {
@@ -111,12 +106,10 @@
 }
 
 
-@include media-breakpoint-down(xs) {
+@include media-breakpoint-down(sm) {
   .file-editor {
     .file-title {
-      .float-right {
-        height: auto;
-      }
+      display: block;
     }
 
     .new-file-name {
@@ -144,6 +137,10 @@
         }
       }
     }
+
+    .editor-ref {
+      max-width: 250px;
+    }
   }
 }
 
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index 8560b72fe85..24f256d083b 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -2,11 +2,11 @@
 
 .file-holder-bottom-radius.file-holder.file.append-bottom-default
   .js-file-title.file-title.clearfix{ data: { current_action: action } }
-    .editor-ref
+    .editor-ref.block-truncated
       = sprite_icon('fork', size: 12)
       = ref
-    %span.editor-file-name
-      - if current_action?(:edit) || current_action?(:update)
+    - if current_action?(:edit) || current_action?(:update)
+      %span.editor-file-name
         = text_field_tag 'file_path', (params[:file_path] || @path),
                                       class: 'form-control new-file-path js-file-path-name-input'
 
@@ -16,7 +16,7 @@
       = text_field_tag 'file_name', params[:file_name], placeholder: "File name",
         required: true, class: 'form-control new-file-name js-file-path-name-input'
 
-    .float-right.file-buttons
+    .file-buttons
       = button_tag class: 'soft-wrap-toggle btn', type: 'button', tabindex: '-1' do
         %span.no-wrap
           = custom_icon('icon_no_wrap')
diff --git a/changelogs/unreleased/47752-buttons-on-new-file-page-wrap-outside-of-container-for-long-branch-names.yml b/changelogs/unreleased/47752-buttons-on-new-file-page-wrap-outside-of-container-for-long-branch-names.yml
new file mode 100644
index 00000000000..81ca632947d
--- /dev/null
+++ b/changelogs/unreleased/47752-buttons-on-new-file-page-wrap-outside-of-container-for-long-branch-names.yml
@@ -0,0 +1,5 @@
+---
+title: Fix buttons on the new file page wrapping outside of the container
+merge_request: 21015
+author:
+type: fixed