diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index ce139cde6d7..5c93afa494f 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1952,7 +1952,15 @@ function theme_system_modules($form) {
       if (module_exists('throttle')) {
         $row[] = array('data' => drupal_render($form['throttle'][$key]), 'class' => 'checkbox');
       }
-      $row[] = '<strong>'. drupal_render($form['name'][$key]) .'</strong>';
+
+      // Add labels only when there is also a checkbox.
+      if (isset($form['status'][$key])) {
+        $row[] = '<strong><label for="'. $form['status'][$key]['#id'] .'">'. drupal_render($form['name'][$key]) .'</label></strong>';
+      }
+      else {
+        $row[] = '<strong>'. drupal_render($form['name'][$key]) .'</strong>';
+      }
+
       $row[] = drupal_render($form['version'][$key]);
       $row[] = array('data' => $description, 'class' => 'description');
       $rows[] = $row;