1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js
index 3c2fc5c3cb..5445e83e15 100644
--- a/phpBB/assets/javascript/plupload.js
+++ b/phpBB/assets/javascript/plupload.js
@@ -253,10 +253,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
 	};
 
 	var done = function(response) {
-		var json = {};
-		try {
-			json = $.parseJSON(response);
-		} catch (e) {
+		if (typeof response !== 'object') {
 			return;
 		}
 
@@ -589,6 +586,11 @@ uploader.bind('FilesAdded', function(up, files) {
 		return;
 	}
 
+	// Switch the active tab if the style supports it
+	if (typeof activateSubPanel == 'function') {
+		activateSubPanel('attach-panel');
+	}
+
 	// Show the file list if there aren't any files currently.
 	if (!$('#file-list-container').is(':visible')) {
 		$('#file-list-container').show(100);