diff --git a/static/css/directives/ui/manage-trigger-control.css b/static/css/directives/ui/manage-trigger-control.css
index 708852881..5f4a399ac 100644
--- a/static/css/directives/ui/manage-trigger-control.css
+++ b/static/css/directives/ui/manage-trigger-control.css
@@ -30,6 +30,12 @@
     height: 28px;
 }
 
+@media (max-width: 768px) {
+    .manage-trigger-control .co-top-bar {
+        margin-bottom: 80px;
+    }
+}
+
 .manage-trigger-control .namespace-avatar {
     margin-left: 2px;
     margin-right: 2px;
diff --git a/static/js/directives/ui/manage-trigger-githost/manage-trigger-githost.component.html b/static/js/directives/ui/manage-trigger-githost/manage-trigger-githost.component.html
index b3fd10bd7..f0efc6600 100644
--- a/static/js/directives/ui/manage-trigger-githost/manage-trigger-githost.component.html
+++ b/static/js/directives/ui/manage-trigger-githost/manage-trigger-githost.component.html
@@ -25,7 +25,7 @@
           </div>
         </div>
 
-        <table class="co-table" style="margin-top: 20px;">
+        <table class="co-table">
           <thead>
             <td class="checkbox-col"></td>
             <td ng-class="$ctrl.TableService.tablePredicateClass('id', $ctrl.local.namespaceOptions.predicate, $ctrl.local.namespaceOptions.reverse)">
diff --git a/static/js/directives/ui/manage-trigger-githost/manage-trigger-githost.component.ts b/static/js/directives/ui/manage-trigger-githost/manage-trigger-githost.component.ts
index a28f1e2f4..f83e58d96 100644
--- a/static/js/directives/ui/manage-trigger-githost/manage-trigger-githost.component.ts
+++ b/static/js/directives/ui/manage-trigger-githost/manage-trigger-githost.component.ts
@@ -62,14 +62,8 @@ export class ManageTriggerGithostComponent implements ng.IComponentController {
 
   public $onInit(): void {
     // TODO: Replace $scope.$watch with @Output methods for child component mutations or $onChanges for parent mutations
-    this.$scope.$watch(() => this.trigger, (trigger) => {
-      if (trigger && this.repository) {
-        this.config = trigger['config'] || {};
-        this.namespaceTitle = 'organization';
-        this.local.selectedNamespace = null;
-        this.loadNamespaces();
-      }
-    });
+    this.$scope.$watch(() => this.trigger, this.initialSetup.bind(this));
+    this.$scope.$watch(() => this.repository, this.initialSetup.bind(this));
 
     this.$scope.$watch(() => this.local.selectedNamespace, (namespace) => {
       if (namespace) {
@@ -102,6 +96,20 @@ export class ManageTriggerGithostComponent implements ng.IComponentController {
     this.$scope.$watch(() => this.local.robotOptions.filter, this.buildOrderedRobotAccounts);
   }
 
+  private initialSetup(): void {
+    if (!this.repository || !this.trigger) { return; }
+
+    if (this.namespaceTitle) {
+      // Already setup.
+      return;
+    }
+
+    this.config = this.trigger['config'] || {};
+    this.namespaceTitle = 'organization';
+    this.local.selectedNamespace = null;
+    this.loadNamespaces();
+  }
+
   public getTriggerIcon(): any {
     return this.TriggerService.getIcon(this.trigger.service);
   }