diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
index 3828fbbb5..85e799bb7 100644
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -333,6 +333,18 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     redirect(s"/${repository.owner}")
   })
 
+  /**
+   * Run GC
+   */
+  post("/:owner/:repository/settings/gc")(ownerOnly { repository =>
+    LockUtil.lock(s"${repository.owner}/${repository.name}") {
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+        git.gc();
+      }
+    }
+    redirect(s"/${repository.owner}/${repository.name}/danger")
+  })
+
   /**
    * Provides duplication check for web hook url.
    */
diff --git a/src/main/twirl/gitbucket/core/settings/danger.scala.html b/src/main/twirl/gitbucket/core/settings/danger.scala.html
index c7b3c9355..c5941a10f 100644
--- a/src/main/twirl/gitbucket/core/settings/danger.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/danger.scala.html
@@ -4,7 +4,7 @@
 @html.main("Danger Zone", Some(repository)){
   @html.menu("settings", repository){
     @menu("danger", repository){
-      <div class="panel panel-default">
+      <div class="panel panel-default" style="overflow: hidden;">
         <div class="panel-heading strong">Danger Zone</div>
         <div class="panel-body">
           <form id="transfer-form" method="post" action="@url(repository)/settings/transfer" validate="true" autocomplete="off">
@@ -31,6 +31,15 @@
               </div>
             </fieldset>
           </form>
+          <form id="gc-form" method="post" action="@url(repository)/settings/gc">
+            <fieldset class="margin form-group">
+              <label class="strong">Garbage collection</label>
+              <div>
+                Run garbage collection for this git repository immediately.
+                <input type="submit" class="btn btn-danger pull-right" value="Garbage collection"/>
+              </div>
+            </fieldset>
+          </form>
         </div>
       </div>
     }
diff --git a/src/main/twirl/gitbucket/core/settings/hooks.scala.html b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
index a82f2d686..0ca0c0d4b 100644
--- a/src/main/twirl/gitbucket/core/settings/hooks.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/hooks.scala.html
@@ -7,7 +7,7 @@
   @html.menu("settings", repository){
     @menu("hooks", repository){
       @helper.html.information(info)
-      <div class="panel panel-default">
+      <div class="panel panel-default" style="overflow: hidden;">
         <div class="panel-heading strong">
           Webhooks
         </div>
diff --git a/src/main/twirl/gitbucket/core/settings/options.scala.html b/src/main/twirl/gitbucket/core/settings/options.scala.html
index d7cb3fcae..1f6acbe28 100644
--- a/src/main/twirl/gitbucket/core/settings/options.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/options.scala.html
@@ -6,7 +6,7 @@
     @menu("options", repository){
       @helper.html.information(info)
       <form id="form" method="post" action="@url(repository)/settings/options" validate="true">
-        <div class="panel panel-default">
+        <div class="panel panel-default" style="overflow: hidden;">
           <div class="panel-heading strong">Settings</div>
           <div class="panel-body">
             <fieldset class="form-group">