diff --git a/javascript/SitetreeAccess.js b/javascript/SitetreeAccess.js
index 2652b256..d25d70dc 100644
--- a/javascript/SitetreeAccess.js
+++ b/javascript/SitetreeAccess.js
@@ -1,63 +1,19 @@
 /**
  * UI behaviour for the "Access" tab
- *
- * Adapted from the forum module "ForumAccess.js" file.
- *
- * @author Markus Lanthaler <markus@silverstripe.com>
  */
 
-ViewersGroupHide = function() {
-	$('ViewerGroups').style.display = "none";
-}
-EditorsGroupHide = function() {
-	$('EditorGroups').style.display = "none";
-}
-
-Behaviour.register({
-	'#Form_EditForm_CanViewType_OnlyTheseUsers': {
-
-		onclick: function() {
-			$('ViewerGroups').style.display = "block";
-		},
-
+var siteTreeAccessHandler = function(canField, groupsField) {
+	var output = {}
+	output['#Form_EditForm_' + canField + ' input'] = {
 		initialize: function() {
-			if($('Form_EditForm_CanViewType_OnlyTheseUsers')) {
-				if($('Form_EditForm_CanViewType_OnlyTheseUsers').checked)
-					$('ViewerGroups').style.display = "block";
-				else
-					$('ViewerGroups').style.display = "none";
-			}
-		}
-	},
-	'#Form_EditForm_CanViewType_Anyone': {
-		onclick: ViewersGroupHide
-	},
-	'#Form_EditForm_CanViewType_LoggedInUsers': {
-		onclick: ViewersGroupHide
-	},
-	'#Form_EditForm_CanViewType_Inherit': {
-		onclick: ViewersGroupHide
-	},
-	
-	'#Form_EditForm_CanEditType_OnlyTheseUsers': {
-		
-		onclick: function() {
-			$('EditorGroups').style.display = "block";
+			if(this.checked) this.click();
 		},
-
-		initialize: function() {
-			if($('Form_EditForm_CanEditType_OnlyTheseUsers')) {
-				if($('Form_EditForm_CanEditType_OnlyTheseUsers').checked)
-					$('EditorGroups').style.display = "block";
-				else
-					$('EditorGroups').style.display = "none";
-			}
+		onclick: function() {
+			$(groupsField).style.display = (this.value == 'OnlyTheseUsers') ? 'block' : 'none';
 		}
-	},
-	'#Form_EditForm_CanEditType_LoggedInUsers': {
-		onclick: EditorsGroupHide
-	},
-	'#Form_EditForm_CanEditType_Inherit': {
-		onclick: EditorsGroupHide
 	}
-});
\ No newline at end of file
+	return output;
+};
+
+Behaviour.register(siteTreeAccessHandler('CanViewType', 'ViewerGroups'));
+Behaviour.register(siteTreeAccessHandler('CanEditType', 'EditorGroups'));
\ No newline at end of file