diff --git a/assets/css/admin.css b/assets/css/admin.css
index 42e7ff1..e4a7373 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -4,10 +4,17 @@
  * @package WC_Composable_Product
  */
 
+/* Hide composable panel by default */
 #composable_product_data {
+    display: none;
     padding: 12px;
 }
 
+/* Show composable panel when composable type is selected */
+body.product-type-composable #composable_product_data {
+    display: block;
+}
+
 .composable_criteria_group {
     border-top: 1px solid #eee;
     padding-top: 12px;
diff --git a/templates/product-selector.twig b/templates/product-selector.twig
index 75c4a54..20b755c 100644
--- a/templates/product-selector.twig
+++ b/templates/product-selector.twig
@@ -9,6 +9,11 @@
     </div>
 
     <div class="composable-products-grid">
+        {% if products is empty %}
+        <div class="composable-no-products">
+            <p>{{ __('No products available for selection. Please configure the product criteria in the admin panel.') }}</p>
+        </div>
+        {% else %}
         {% for product in products %}
         <div class="composable-product-item{% if not product.in_stock %} out-of-stock{% endif %}" data-product-id="{{ product.id }}" data-price="{{ product.price }}" data-stock-status="{{ product.stock_status }}">
             <div class="product-item-inner">
@@ -52,6 +57,7 @@
             </div>
         </div>
         {% endfor %}
+        {% endif %}
     </div>
 
     {% if show_total %}