diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 6bca3c8..d1276f3 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -38,7 +38,7 @@ export class AppComponent implements OnInit {
 
     private openInitialSetupIfNecessary(): void {
         this.settingsService.getLastSynchronizationDate().then((date) => {
-            if (date) {
+            if (!date) {
                 return this.goToInitialSetup();
             }
         });
diff --git a/src/app/service/setup/setup.service.ts b/src/app/service/setup/setup.service.ts
index 4da5afe..fa448dc 100644
--- a/src/app/service/setup/setup.service.ts
+++ b/src/app/service/setup/setup.service.ts
@@ -13,11 +13,17 @@ export class SetupService {
         return this.processService.executeCommand('pkexec apt install snapd');
     }
 
-    checkIfSnapdIsIntalled(): void {
-        this.processService.executeCommand('pkexec apt install snapd');
+    checkIfSnapdIsInstalled(): Promise<void> {
+        return this.processService.executeCommand('snap version').then(() => {
+            return;
+        });
     }
 
-    checkIfFlatpakIsIntalled(): void {
-        this.processService.executeCommand('pkexec apt install snapd');
+    checkIfFlatpakIsInstalled(): Promise<void> {
+        return this.processService
+            .executeCommand('flatpak --version')
+            .then(() => {
+                return;
+            });
     }
 }
diff --git a/src/app/ui/components/setup-item-card/setup-item-card.component.html b/src/app/ui/components/setup-item-card/setup-item-card.component.html
index c9c16bc..4750988 100644
--- a/src/app/ui/components/setup-item-card/setup-item-card.component.html
+++ b/src/app/ui/components/setup-item-card/setup-item-card.component.html
@@ -3,6 +3,7 @@
         <div class="d-flex justify-content-between">
             <span class="item-name">{{ itemName }}</span>
             <div>
+                <nb-icon *ngIf="status === 'installed'" icon="checkmark-circle-2-outline" status="success" size="large"></nb-icon>
                 <button
                     nbButton
                     hero
diff --git a/src/app/ui/components/setup-item-card/setup-item-card.module.ts b/src/app/ui/components/setup-item-card/setup-item-card.module.ts
index 21e5a7e..2a0e169 100644
--- a/src/app/ui/components/setup-item-card/setup-item-card.module.ts
+++ b/src/app/ui/components/setup-item-card/setup-item-card.module.ts
@@ -1,7 +1,12 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SetupItemCardComponent } from './setup-item-card.component';
-import { NbButtonModule, NbCardModule, NbSpinnerModule } from '@nebular/theme';
+import {
+    NbButtonModule,
+    NbCardModule,
+    NbIconModule,
+    NbSpinnerModule,
+} from '@nebular/theme';
 import { TranslateModule } from '@ngx-translate/core';
 
 @NgModule({
@@ -12,6 +17,7 @@ import { TranslateModule } from '@ngx-translate/core';
         NbButtonModule,
         NbSpinnerModule,
         TranslateModule,
+        NbIconModule,
     ],
     exports: [SetupItemCardComponent],
 })
diff --git a/src/app/ui/pages/initial-setup/initial-setup.component.ts b/src/app/ui/pages/initial-setup/initial-setup.component.ts
index a4a8c41..155bd59 100644
--- a/src/app/ui/pages/initial-setup/initial-setup.component.ts
+++ b/src/app/ui/pages/initial-setup/initial-setup.component.ts
@@ -18,16 +18,32 @@ export class InitialSetupComponent implements OnInit {
     }
 
     private checkSetup(): void {
-        this.checkIfFlatpakIsIntalled();
-        this.checkIfSnapdIsIntalled();
+        this.checkIfFlatpakIsInstalled();
+        this.checkIfSnapdIsInstalled();
     }
 
-    private checkIfSnapdIsIntalled(): void {
-        this.setupService.checkIfSnapdIsIntalled();
+    private checkIfSnapdIsInstalled(): void {
+        this.snapdStatus = CardStatus.LOADING;
+        this.setupService
+            .checkIfSnapdIsInstalled()
+            .then(() => {
+                this.snapdStatus = CardStatus.INSTALLED;
+            })
+            .catch(() => {
+                this.snapdStatus = CardStatus.NOT_INSTALLED;
+            });
     }
 
-    private checkIfFlatpakIsIntalled(): void {
-        this.setupService.checkIfFlatpakIsIntalled();
+    private checkIfFlatpakIsInstalled(): void {
+        this.flatpakStatus = CardStatus.LOADING;
+        this.setupService
+            .checkIfFlatpakIsInstalled()
+            .then(() => {
+                this.flatpakStatus = CardStatus.INSTALLED;
+            })
+            .catch(() => {
+                this.flatpakStatus = CardStatus.NOT_INSTALLED;
+            });
     }
 
     installSnapd(): void {