diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 5837d93f..2b824929 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -88,9 +88,9 @@ JS
 			new GridFieldSortableHeader(),
 			new GridFieldFilter(),
 			new GridFieldDefaultColumns(),
-			new GridFieldPaginator(10),
-			new GridFieldAction_Delete(),
+			new GridFieldPaginator(15),
 			new GridFieldAction_Edit(),
+			new GridFieldAction_Delete(),
 			new GridFieldPopupForms()
 		);
 		$files = DataList::create('File')
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index e87ebdfa..1384c32c 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -67,7 +67,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 					CMS_DIR . '/javascript/CMSMain.js',
 					CMS_DIR . '/javascript/CMSMain.EditForm.js',
 					CMS_DIR . '/javascript/CMSMain.AddForm.js',
-					CMS_DIR . '/javascript/CMSMain.GridField.js',
 					CMS_DIR . '/javascript/CMSPageHistoryController.js',
 					// CMS_DIR . '/javascript/CMSPagesController.Tree.js',
 					CMS_DIR . '/javascript/SilverStripeNavigator.js'
diff --git a/css/screen.css b/css/screen.css
index 216966d2..988a3137 100644
--- a/css/screen.css
+++ b/css/screen.css
@@ -15,4 +15,3 @@
 .cms .AssetAdmin #Form_EditForm_File td.col-StripThumbnail img { width: 32px; height: 32px; }
 .cms .AssetAdmin #Form_EditForm_File tr[data-class=Folder] td.col-StripThumbnail { background: transparent url(../../sapphire/admin/images/sprites-32x32/blue-folder-horizontal.png) no-repeat top left; }
 .cms .AssetAdmin #Form_EditForm_File tr[data-class=File] td.col-StripThumbnail { background: transparent url(../../sapphire/admin/images/sprites-32x32/blue-document.png) no-repeat top left; }
-.cms .AssetAdmin #Form_EditForm_File td.col-Title { cursor: pointer; }
diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js
index 27258c79..3da0126c 100644
--- a/javascript/AssetAdmin.js
+++ b/javascript/AssetAdmin.js
@@ -32,7 +32,7 @@
 			onclick: function(e) {
 				// Let actions do their own thing
 				if($(e.target).is('.action')) {
-					this._super();
+					this._super(e);
 					return;
 				}
 
@@ -40,7 +40,7 @@
 				if(this.data('class') == 'Folder') {
 					var url = grid.data('urlFolderTemplate').replace('%s', this.data('id'));
 					$('.cms-container').loadPanel(url);
-					e.preventDefault();
+					return false;
 				}
 			}
 		});
diff --git a/javascript/CMSMain.GridField.js b/javascript/CMSMain.GridField.js
deleted file mode 100644
index 359fa91e..00000000
--- a/javascript/CMSMain.GridField.js
+++ /dev/null
@@ -1,13 +0,0 @@
-jQuery(function($){
-	$('.ss-gridfield').entwine({
-		onopennewview: function(e, url) {
-			$('.cms-container').entwine('ss').loadPanel(url);
-			return false;
-		},
-
-		onopeneditview: function(e, url) {
-			$('.cms-container').entwine('ss').loadPanel(url);
-			return false;
-		}
-	});
-});
\ No newline at end of file
diff --git a/scss/_AssetAdmin.scss b/scss/_AssetAdmin.scss
index d806a5ea..3fc02ae3 100644
--- a/scss/_AssetAdmin.scss
+++ b/scss/_AssetAdmin.scss
@@ -27,8 +27,5 @@
 				background: transparent url(../../sapphire/admin/images/sprites-32x32/blue-document.png) no-repeat top left;
 			}
 		}
-		td.col-Title {
-			cursor: pointer;
-		}
 	}
 } 
\ No newline at end of file