diff --git a/grails-app/assets/javascripts/streama/controllers/modal-file-ctrl.js b/grails-app/assets/javascripts/streama/controllers/modal-file-ctrl.js
index be6913053..b265e2fba 100644
--- a/grails-app/assets/javascripts/streama/controllers/modal-file-ctrl.js
+++ b/grails-app/assets/javascripts/streama/controllers/modal-file-ctrl.js
@@ -7,6 +7,8 @@ angular.module('streama').controller('modalFileCtrl', [
     $scope.localFilesEnabled = false;
     $scope.localFiles = [];
     $scope.activeTab = localStorageService.get('activeFileModalTab')|| 'upload';
+    $scope.closeOnSelect = localStorageService.get('fileModal.closeOnSelect');
+    if($scope.closeOnSelect == null){$scope.closeOnSelect = true;}
 
     var localFileLastPath = localStorageService.get('localFileLastPath')|| '';
 		$scope.localDir = localFileLastPath.split('/') || [];
@@ -15,6 +17,7 @@ angular.module('streama').controller('modalFileCtrl', [
     $scope.loadLocalFiles = loadLocalFiles;
 		$scope.backLocalDirectory = backLocalDirectory;
 		$scope.openLocalDirectory = openLocalDirectory;
+		$scope.toggleCloseOnSelect = toggleCloseOnSelect;
 
 
 		$scope.loadLocalFiles(localFileLastPath);
@@ -77,6 +80,9 @@ angular.module('streama').controller('modalFileCtrl', [
           $scope.video.files.push(data);
 					$scope.video.hasFiles = true;
         }
+        if($scope.closeOnSelect){
+          $uibModalInstance.dismiss('cancel');
+        }
       }).error(function(data) {
         alertify.error(data.message);
       });
@@ -134,4 +140,8 @@ angular.module('streama').controller('modalFileCtrl', [
       })
     };
 
+    function toggleCloseOnSelect() {
+      localStorageService.set('fileModal.closeOnSelect', $scope.closeOnSelect);
+    }
+
   }]);
diff --git a/grails-app/assets/javascripts/streama/templates/modal--manage-files.tpl.htm b/grails-app/assets/javascripts/streama/templates/modal--manage-files.tpl.htm
index 08901f633..9c4c6cb03 100644
--- a/grails-app/assets/javascripts/streama/templates/modal--manage-files.tpl.htm
+++ b/grails-app/assets/javascripts/streama/templates/modal--manage-files.tpl.htm
@@ -73,6 +73,12 @@
           </tr>
         </table>
       </div>
+
+      <div class="checkbox">
+        <label>
+          <input type="checkbox" ng-model="closeOnSelect" ng-click="toggleCloseOnSelect()"> Close Modal on Select
+        </label>
+      </div>
     </div>
   </div>