diff --git a/pmd-eclipse-plugin/ReleaseNotes.md b/pmd-eclipse-plugin/ReleaseNotes.md
index 0a978bcdb1..892f626455 100644
--- a/pmd-eclipse-plugin/ReleaseNotes.md
+++ b/pmd-eclipse-plugin/ReleaseNotes.md
@@ -8,6 +8,7 @@ Eclipse Update Site: http://sourceforge.net/projects/pmd/files/pmd-eclipse/updat
 * The official update site is now: http://sourceforge.net/projects/pmd/files/pmd-eclipse/update-site/
 * Fixed right click to add reviewed comment missing ([bug #1052])
 * Fixed PMD Eclipse: How to ... documentation missing ([bug #1061])
+* Fixed Properties page: "Rule-Selection" should be disabled if project-local config is selected ([bug #1070])
 * Fixed Violations are reported multiple times ([bug #1071])
 * Fixed Exclude pattern does not work ([bug #1079])
 * Fixed SWTError: No more handles on Violation Outline View ([bug #1096])
@@ -18,6 +19,7 @@ Eclipse Update Site: http://sourceforge.net/projects/pmd/files/pmd-eclipse/updat
 
 [bug #1052]: https://sourceforge.net/p/pmd/bugs/1052/
 [bug #1061]: https://sourceforge.net/p/pmd/bugs/1061/
+[bug #1070]: https://sourceforge.net/p/pmd/bugs/1070/
 [bug #1071]: https://sourceforge.net/p/pmd/bugs/1071/
 [bug #1079]: https://sourceforge.net/p/pmd/bugs/1079/
 [bug #1096]: https://sourceforge.net/p/pmd/bugs/1096/
diff --git a/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/PMDProjectPropertyPage.java b/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/PMDProjectPropertyPage.java
index 6b5790181d..ec51c3df26 100644
--- a/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/PMDProjectPropertyPage.java
+++ b/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/properties/PMDProjectPropertyPage.java
@@ -231,7 +231,6 @@ public class PMDProjectPropertyPage extends PropertyPage {
 		            data.verticalAlignment = GridData.FILL;
 		            ruleDescriptionPanel.setLayoutData(data);
 	            
-            refreshRuleSetInProject();
             adjustControls();
         } else {
             setValid(false);
@@ -254,11 +253,9 @@ public class PMDProjectPropertyPage extends PropertyPage {
     	boolean isEnabled = enablePMDButton.getSelection();
     	SWTUtil.setEnabled(activeControls, isEnabled);
     	
-    	showDescriptionField(isEnabled && !ruleSetStoredInProjectButton.getSelection());
-    	
     	if (isEnabled) {
     		deselectWorkingSetButton.setEnabled(selectedWorkingSet != null);
-    		enableExternalRulesetControls(ruleSetStoredInProjectButton.getSelection());
+    		refreshRuleSetInProject();
     	}
     }
     
@@ -335,7 +332,7 @@ public class PMDProjectPropertyPage extends PropertyPage {
 
         button.addSelectionListener(new SelectionAdapter() {
             public void widgetSelected(SelectionEvent e) {
-            	refreshRuleSetInProject();
+                adjustControls();
             }
         });
 
@@ -353,7 +350,7 @@ public class PMDProjectPropertyPage extends PropertyPage {
 
         button.addSelectionListener(new SelectionAdapter() {
             public void widgetSelected(SelectionEvent e) {
-            	refreshRuleSetInProject();
+                adjustControls();
             }
         });
 
@@ -660,9 +657,11 @@ public class PMDProjectPropertyPage extends PropertyPage {
         Table ruleTable = availableRulesTableViewer.getTable();
         if (ruleSetStoredInProjectButton.getSelection()) {
             ruleTable.setEnabled(false);
+            showDescriptionField(false);
             enableExternalRulesetControls(true);
         } else {
             ruleTable.setEnabled(true);
+            showDescriptionField(true);
             enableExternalRulesetControls(false);
         }
     }