diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js
index fd52982..120a697 100644
--- a/client/js/controllers/image/edit.js
+++ b/client/js/controllers/image/edit.js
@@ -19,7 +19,6 @@ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', '
         });
         $scope.data = {};
 
-
         $scope.applyEdition = function (id) {
             Image.updateImage($scope.data, function () {
                 $rootScope.$broadcast("updateImageEvent");
diff --git a/client/partials/image/edit.html b/client/partials/image/edit.html
index a8825c5..734da7f 100644
--- a/client/partials/image/edit.html
+++ b/client/partials/image/edit.html
@@ -34,7 +34,7 @@
                     </fieldset>
 
                 </form>
-                <form action="../server/index.php" method="post">
+                <form action="../server/index.php" method="post" ng-if='image.status == "queued"'>
                     <input type="hidden" name="task" value="image" />
                     <input type="hidden" name="token" value="{{ getToken()}}" />
                     <input type="hidden" name="action" value="uploadImage" />
@@ -43,8 +43,8 @@
                     <input type="hidden" name="file_name" value="cirros-0.3.4-x86_64-disk.img" />
                     <fieldset class="form-group">
                         <label class="control-label col-sm-2">Upload</label>
-                        <input name="file" type="file" />
-                        <input type="submit" value="Upload" />
+                        <input name="file" type="file"/>
+                        <input type="submit" value="Upload"/>
 
                     </fieldset>
                 </form>