diff --git a/src/lib/registration/ui/addon_selection_dialog.rb b/src/lib/registration/ui/addon_selection_dialog.rb
index 4eb49493f..e32df2ee4 100644
--- a/src/lib/registration/ui/addon_selection_dialog.rb
+++ b/src/lib/registration/ui/addon_selection_dialog.rb
@@ -203,18 +203,21 @@ def reactivate_dependencies
 
       # check for the maximum amount of reg. codes supported by Yast
       def supported_addon_count?
-        need_regcode = Addon.selected.reject(&:registered?).reject(&:free)
         # maximum number or reg codes which can be displayed in two column layout
         max_supported = 2*MAX_REGCODES_PER_COLUMN
 
         # check the addons requiring a reg. code
-        if need_regcode.size > max_supported
+        if selected_non_free_addons.size > max_supported
           Report.Error(_("YaST allows to select at most %s extensions or modules.") % max_supported)
           return false
         end
 
         return true
       end
+
+      def selected_non_free_addons
+        Addon.selected.reject(&:registered?).reject(&:free)
+      end
     end
   end
 end