diff --git a/RETableViewManager/RETableViewManager.m b/RETableViewManager/RETableViewManager.m
index 7096c19..064a6d6 100644
--- a/RETableViewManager/RETableViewManager.m
+++ b/RETableViewManager/RETableViewManager.m
@@ -104,6 +104,12 @@ BOOL REDeviceIsUIKit7() {
     NSAssert(NSClassFromString(objectClass), ([NSString stringWithFormat:@"Item class '%@' does not exist.", identifier]));
     NSAssert(NSClassFromString(identifier), ([NSString stringWithFormat:@"Cell class '%@' does not exist.", identifier]));
     [_registeredClasses setObject:identifier forKey:objectClass];
+    
+    // Perform check if a XIB exists with the same name as the cell class
+    //
+    if ([[NSBundle mainBundle] pathForResource:identifier ofType:@"nib"]) {
+        [self.tableView registerNib:[UINib nibWithNibName:identifier bundle:nil] forCellReuseIdentifier:objectClass];
+    }
 }
 
 - (id)objectAtKeyedSubscript:(id <NSCopying>)key
diff --git a/RETableViewManagerExample/RETableViewManagerExample/Classes/Controllers/XIBTestViewController.m b/RETableViewManagerExample/RETableViewManagerExample/Classes/Controllers/XIBTestViewController.m
index 428ef36..1801718 100644
--- a/RETableViewManagerExample/RETableViewManagerExample/Classes/Controllers/XIBTestViewController.m
+++ b/RETableViewManagerExample/RETableViewManagerExample/Classes/Controllers/XIBTestViewController.m
@@ -24,10 +24,6 @@
     //
     _manager = [[RETableViewManager alloc] initWithTableView:self.tableView delegate:self];
     
-    // Register XIB file
-    //
-    [self.tableView registerNib:[UINib nibWithNibName:@"XIBTestCell" bundle:nil] forCellReuseIdentifier:@"XIBTestItem"];
-    
     // Map item to a cell
     //
     _manager[@"XIBTestItem"] = @"XIBTestCell";