diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index a8a0fd80..a6999505 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -27,13 +27,17 @@
                         </button>
                     </div>
                     <div class="box-content condensed" [hidden]="!showOptions">
-                        <div class="box-content-row" appBoxRow>
-                            <label for="type" class="sr-only">{{'type' | i18n}}</label>
-                            <select id="type" [(ngModel)]="options.type" (change)="saveOptions()">
-                                <option value="password">{{'password' | i18n}}</option>
-                                <option value="passphrase">{{'passphrase' | i18n}}</option>
-                            </select>
-                        </div>
+                        <div class="box-content-row box-content-row-radio">
+                            <div class="radio-group text-default" appBoxRow name="PassTypeOptions"
+                                *ngFor="let o of passTypeOptions">
+                                <label for="type" class="sr-only">{{'type' | i18n}}</label>
+                                <input type="radio" class="radio" [(ngModel)]="options.type" name="Type_{{o.value}}"
+                                    id="type_{{o.value}}" [value]="o.value" (change)="saveOptions()"
+                                    [checked]="options.type === o.value">
+                                <label class="unstyled" for="type_{{o.value}}">
+                                    {{o.name | i18n}}
+                                </label>
+                            </div>
                     </div>
                 </div>
                 <div class="box" [hidden]="!showOptions" *ngIf="options.type === 'passphrase'">
diff --git a/src/app/vault/password-generator.component.ts b/src/app/vault/password-generator.component.ts
index 5e76f528..008eeba0 100644
--- a/src/app/vault/password-generator.component.ts
+++ b/src/app/vault/password-generator.component.ts
@@ -13,8 +13,13 @@ import {
     templateUrl: 'password-generator.component.html',
 })
 export class PasswordGeneratorComponent extends BasePasswordGeneratorComponent {
+    passTypeOptions: any[];
     constructor(passwordGenerationService: PasswordGenerationService, platformUtilsService: PlatformUtilsService,
         i18nService: I18nService) {
         super(passwordGenerationService, platformUtilsService, i18nService, window);
+        this.passTypeOptions = [
+            { name: 'password', value: 'password' },
+            { name: 'passphrase', value: 'passphrase' }
+        ]
     }
 }