diff --git a/lib/browser/app.js b/lib/browser/app.js
index 216146a3..531331f2 100644
--- a/lib/browser/app.js
+++ b/lib/browser/app.js
@@ -90,10 +90,6 @@ app.controller('AppController', function(
 
   AnalyticsService.logEvent('Restart');
 
-  if (!this.writer.isBurning()) {
-    this.writer.resetState();
-  }
-
   NotifierService.subscribe($scope, 'image-writer:state', function(state) {
     AnalyticsService.log(`Progress: ${state.progress}% at ${state.speed} MB/s`);
 
@@ -214,11 +210,12 @@ app.controller('NavigationController', function($state) {
   this.open = shell.openExternal;
 });
 
-app.controller('FinishController', function($state, SelectionStateService, SettingsService) {
+app.controller('FinishController', function($state, SelectionStateService, SettingsService, ImageWriterService) {
   this.settings = SettingsService.data;
 
   this.restart = function(options) {
     SelectionStateService.clear(options);
+    ImageWriterService.resetState();
     $state.go('main');
   };
 });