diff --git a/app/components/code-climate-popup.coffee b/app/components/code-climate-popup.coffee
new file mode 100644
index 00000000..206106e5
--- /dev/null
+++ b/app/components/code-climate-popup.coffee
@@ -0,0 +1,10 @@
+`import Ember from 'ember'`
+
+Component = Ember.Component.extend(
+  actions:
+    close: ->
+      $('.popup').removeClass('display')
+      return false
+)
+
+`export default Component`
diff --git a/app/components/remove-log-popup.coffee b/app/components/remove-log-popup.coffee
new file mode 100644
index 00000000..4ec49473
--- /dev/null
+++ b/app/components/remove-log-popup.coffee
@@ -0,0 +1,23 @@
+`import Ember from 'ember'`
+
+Component = Ember.Component.extend(
+  actions:
+    close: ->
+      $('.popup').removeClass('display')
+      return false
+
+    removeLog: ->
+      $('.popup').removeClass('display')
+      job = @get('job')
+      job.removeLog().then ->
+        Travis.flash(success: 'Log has been successfully removed.')
+      , (xhr) ->
+        if xhr.status == 409
+          Travis.flash(error: 'Log can\'t be removed')
+        else if xhr.status == 401
+          Travis.flash(error: 'You don\'t have sufficient access to remove the log')
+        else
+          Travis.flash(error: 'An error occured when removing the log')
+)
+
+`export default Component`
diff --git a/app/templates/components/code-climate-popup.hbs b/app/templates/components/code-climate-popup.hbs
index 372f41ef..7035909b 100644
--- a/app/templates/components/code-climate-popup.hbs
+++ b/app/templates/components/code-climate-popup.hbs
@@ -1,6 +1,6 @@
 <div id="code-climate" class="popup">
   <img src="/images/icons/code-climate-logo.svg" id="code-climate-logo"/>
-  <a href="#" class="close" {{action "popupClose" target=view}}></a>
+  <a href="#" class="close" {{action "close"}}></a>
   <p>
     <b>Want test coverage for your tests?</b>
   </p>
diff --git a/app/templates/components/remove-log-popup.hbs b/app/templates/components/remove-log-popup.hbs
new file mode 100644
index 00000000..ce0299b7
--- /dev/null
+++ b/app/templates/components/remove-log-popup.hbs
@@ -0,0 +1,10 @@
+<div id="remove-log-popup" class="popup">
+  <a href="#" class="close" {{action "close"}}></a>
+  <p><strong>This action will remove the log permanently!</strong></p>
+  <p>Do you want to continue?</p>
+  <p>
+    <a class="sync_now button" {{action "removeLog"}}>Yes, please!</a>
+    <span class="or">or</span>
+    <a href="#" class="cancel" {{action "close"}}>Cancel</a>
+  </p>
+</div>
diff --git a/app/templates/components/repo-actions.hbs b/app/templates/components/repo-actions.hbs
index e6cb6c53..7a2f4e24 100644
--- a/app/templates/components/repo-actions.hbs
+++ b/app/templates/components/repo-actions.hbs
@@ -18,16 +18,4 @@
 
 </div>
 
-
-<div id="remove-log-popup" class="popup">
-  <a href="#" class="close" {{action "popupClose" target=view}}></a>
-  <p><strong>This action will remove the log permanently!</strong></p>
-  <p>Do you want to continue?</p>
-  <p>
-    <a class="sync_now button" {{action "removeLog" target="view"}}>Yes, please!</a>
-    <span class="or">or</span>
-    <a href="#" class="cancel" {{action "popupClose" target=view}}>Cancel</a>
-  </p>
-</div>
-
 {{code-climate-popup}}
diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs
index 9ab267bd..e969488b 100644
--- a/app/templates/jobs/pre.hbs
+++ b/app/templates/jobs/pre.hbs
@@ -1,3 +1,5 @@
+{{remove-log-popup job=view.job}}
+
 <section id="log-container" class="log">
   {{#if view.job.notStarted}}
     <div class="log-notice">Hang tight, the log cannot be shown until the build has started.</div>
diff --git a/app/templates/remove-log.hbs b/app/templates/remove-log.hbs
deleted file mode 100644
index ad8e2fa7..00000000
--- a/app/templates/remove-log.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-<a href="#" class="close" {{action "close" target=view}}></a>
-<p><strong>This action will remove the log permanently!</strong></p>
-<p>Do you want to continue?</p>
-<p>
-  <a class="sync_now button">Yes, please!</a>
-  <span class="or">or</span>
-  <a href="#" class="cancel">Cancel</a>
-</p>
diff --git a/app/views/pre.coffee b/app/views/pre.coffee
index bda4bd62..89f475d5 100644
--- a/app/views/pre.coffee
+++ b/app/views/pre.coffee
@@ -121,23 +121,8 @@ View = BasicView.extend
       @engine.autoCloseFold = !Travis.tailing.isActive()
       event.preventDefault()
 
-    removeLog: ->
-      @popupCloseAll()
-      if @get('canRemoveLog')
-        job = @get('_job') || @get('build.jobs.firstObject')
-        job.removeLog().then ->
-          Travis.flash(success: 'Log has been successfully removed.')
-        , (xhr) ->
-          if xhr.status == 409
-            Travis.flash(error: 'Log can\'t be removed')
-          else if xhr.status == 401
-            Travis.flash(error: 'You don\'t have sufficient access to remove the log')
-          else
-            Travis.flash(error: 'An error occured when removing the log')
-
     removeLogPopup: ->
       if @get('canRemoveLog')
-        @set('active', true)
         @popup('remove-log-popup')
         return false
 
diff --git a/remove-log-popup.coffee b/remove-log-popup.coffee
new file mode 100644
index 00000000..ce0299b7
--- /dev/null
+++ b/remove-log-popup.coffee
@@ -0,0 +1,10 @@
+<div id="remove-log-popup" class="popup">
+  <a href="#" class="close" {{action "close"}}></a>
+  <p><strong>This action will remove the log permanently!</strong></p>
+  <p>Do you want to continue?</p>
+  <p>
+    <a class="sync_now button" {{action "removeLog"}}>Yes, please!</a>
+    <span class="or">or</span>
+    <a href="#" class="cancel" {{action "close"}}>Cancel</a>
+  </p>
+</div>