diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 135dd8ad8c..d49e3f3032 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -51,12 +51,6 @@ import { SpawnsComponent } from './components/editors/creature/spawns/spawns.com
 import { SpawnsAddonComponent } from './components/editors/creature/spawns-addon/spawns-addon.component';
 import { QueryErrorComponent } from './components/editors/shared/query-output/query-error/query-error.component';
 import { uiSwitchConfig } from './config/ui-switch.config';
-import {
-  SingleValueSelectorBtnComponent
-} from './components/editors/shared/selectors/single-value-selector/single-value-selector-btn.component';
-import {
-  SingleValueSelectorModalComponent
-} from './components/editors/shared/selectors/single-value-selector/single-value-selector-modal.component';
 import { ComingSoonComponent } from './components/editors/coming-soon/coming-soon.component';
 
 const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
@@ -64,9 +58,6 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
 };
 
 @NgModule({
-  entryComponents: [
-    SingleValueSelectorModalComponent,
-  ],
   declarations: [
     AppComponent,
     DashboardComponent,
@@ -74,8 +65,6 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
     SidebarComponent,
     MainWindowComponent,
     QueryErrorComponent,
-    SingleValueSelectorModalComponent,
-    SingleValueSelectorBtnComponent,
     HighlightjsWrapperComponent,
     CreateComponent,
     TopBarComponent,
diff --git a/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector-btn.component.spec.ts b/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector-btn.component.spec.ts
index 50d1fce9bb..bb1651d989 100644
--- a/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector-btn.component.spec.ts
+++ b/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector-btn.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ModalModule } from 'ngx-bootstrap';
 
 import { SingleValueSelectorBtnComponent } from './single-value-selector-btn.component';
+import { SingleValueSelectorModule } from './single-value-selector.module';
 
 describe('SingleValueSelectorBtnComponent', () => {
   let component: SingleValueSelectorBtnComponent;
@@ -9,10 +9,7 @@ describe('SingleValueSelectorBtnComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SingleValueSelectorBtnComponent ],
-      imports: [
-        ModalModule.forRoot(),
-      ]
+      imports: [ SingleValueSelectorModule ],
     })
     .compileComponents();
   }));
diff --git a/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector-modal.component.spec.ts b/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector-modal.component.spec.ts
index c554e9d45e..bdced9b256 100644
--- a/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector-modal.component.spec.ts
+++ b/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector-modal.component.spec.ts
@@ -1,9 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { NgxDatatableModule } from '@swimlane/ngx-datatable';
 import { BsModalRef } from 'ngx-bootstrap';
 
 import { SingleValueSelectorModalComponent } from './single-value-selector-modal.component';
-import { CommonTestModule } from '../../../../../test-utils/common-test.module';
+import { SingleValueSelectorModule } from './single-value-selector.module';
 
 describe('SingleValueSelectorModalComponent', () => {
   let component: SingleValueSelectorModalComponent;
@@ -13,11 +12,7 @@ describe('SingleValueSelectorModalComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SingleValueSelectorModalComponent ],
-      imports: [
-        CommonTestModule,
-        NgxDatatableModule,
-      ],
+      imports: [ SingleValueSelectorModule ],
       providers: [
         BsModalRef,
       ],
diff --git a/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector.module.ts b/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector.module.ts
new file mode 100644
index 0000000000..c95e3260ad
--- /dev/null
+++ b/src/app/components/editors/shared/selectors/single-value-selector/single-value-selector.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { ModalModule } from 'ngx-bootstrap';
+import { NgxDatatableModule } from '@swimlane/ngx-datatable';
+
+import { SingleValueSelectorModalComponent } from './single-value-selector-modal.component';
+import { SingleValueSelectorBtnComponent } from './single-value-selector-btn.component';
+
+@NgModule({
+  entryComponents: [
+    SingleValueSelectorModalComponent,
+  ],
+  declarations: [
+    SingleValueSelectorModalComponent,
+    SingleValueSelectorBtnComponent,
+  ],
+  imports: [
+    BrowserModule,
+    ModalModule.forRoot(),
+    NgxDatatableModule,
+  ],
+  exports: [
+    SingleValueSelectorBtnComponent,
+  ],
+})
+export class SingleValueSelectorModule {}